Abstract prebuilt_etc into prebuilt_file am: 8350eebacf am: a51301ca2f am: dc0928061d am: 61f57bbd64 am: 7a20773030
Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/1977646
Change-Id: Iec6576df2ad4f642b06d8b7262c257c4694fb67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/rules/apex.bzl b/rules/apex.bzl
index ed514bd..70e14a7 100644
--- a/rules/apex.bzl
+++ b/rules/apex.bzl
@@ -15,7 +15,7 @@
"""
load(":apex_key.bzl", "ApexKeyInfo")
-load(":prebuilt_etc.bzl", "PrebuiltEtcInfo")
+load(":prebuilt_file.bzl", "PrebuiltFileInfo")
load(":sh_binary.bzl", "ShBinaryInfo")
load("//build/bazel/rules/cc:stripped_cc_common.bzl", "StrippedCcBinaryInfo")
load("//build/bazel/rules/android:android_app_certificate.bzl", "AndroidAppCertificateInfo")
@@ -53,7 +53,7 @@
# Handle prebuilts
for dep in ctx.attr.prebuilts:
# TODO: Support more prebuilts than just PrebuiltEtc
- prebuilt_etc_info = dep[PrebuiltEtcInfo]
+ prebuilt_etc_info = dep[PrebuiltFileInfo]
directory = "etc"
if prebuilt_etc_info.sub_dir != None and prebuilt_etc_info.sub_dir != "":
diff --git a/rules/prebuilt_etc.bzl b/rules/prebuilt_file.bzl
similarity index 84%
rename from rules/prebuilt_etc.bzl
rename to rules/prebuilt_file.bzl
index 7fa93b0..210a42f 100644
--- a/rules/prebuilt_etc.bzl
+++ b/rules/prebuilt_file.bzl
@@ -14,19 +14,19 @@
limitations under the License.
"""
-PrebuiltEtcInfo = provider(
- "Info needed for prebuilt_etc modules",
+PrebuiltFileInfo = provider(
+ "Info needed for prebuilt_file modules",
fields = {
"src": "Source file of this prebuilt",
- "sub_dir": "Optional subdirectory to install into",
+ "sub_dir": "Optional subdirectory into which to install",
"filename": "Optional name for the installed file",
"installable": "Whether this is directly installable into one of the partitions",
},
)
-def _prebuilt_etc_rule_impl(ctx):
+def _prebuilt_file_rule_impl(ctx):
return [
- PrebuiltEtcInfo(
+ PrebuiltFileInfo(
src = ctx.file.src,
sub_dir = ctx.attr.sub_dir,
filename = ctx.attr.filename,
@@ -34,8 +34,8 @@
),
]
-_prebuilt_etc = rule(
- implementation = _prebuilt_etc_rule_impl,
+_prebuilt_file = rule(
+ implementation = _prebuilt_file_rule_impl,
attrs = {
"src": attr.label(mandatory = True, allow_single_file = True),
"sub_dir": attr.string(),
@@ -44,7 +44,7 @@
},
)
-def prebuilt_etc(
+def prebuilt_file(
name,
src,
sub_dir = None,
@@ -55,7 +55,7 @@
**kwargs):
"Bazel macro to correspond with the prebuilt_etc Soong module."
- _prebuilt_etc(
+ _prebuilt_file(
name = name,
src = src,
sub_dir = sub_dir,