diff options
| author | Alex Márquez Pérez Muñíz Díaz Púras Thaureaux <alexmarquez@google.com> | 2022-02-08 18:26:03 -0500 |
|---|---|---|
| committer | Alex Márquez Pérez Muñíz Díaz Púras Thaureaux <alexmarquez@google.com> | 2022-04-21 14:37:21 +0000 |
| commit | 8350eebacfbe3e7faad60784763c2332b8aa4887 (patch) | |
| tree | 97861c7f8b7ab788eb671d2e8a5f0df0649eeb56 | |
| parent | bc077c22caddcd2d25e49b6a131b113a4cc443c6 (diff) | |
| download | bazel-8350eebacfbe3e7faad60784763c2332b8aa4887.tar.gz | |
Abstract prebuilt_etc into prebuilt_file
Bug: 215723302
Test: mixed_{libc,droid}.sh yield output equivalent to before
Change-Id: I357a5beda3e9675b137bac67d37495a76f809325
| -rw-r--r-- | rules/apex.bzl | 4 | ||||
| -rw-r--r-- | rules/prebuilt_file.bzl (renamed from rules/prebuilt_etc.bzl) | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/rules/apex.bzl b/rules/apex.bzl index ed514bd9..70e14a72 100644 --- a/rules/apex.bzl +++ b/rules/apex.bzl @@ -15,7 +15,7 @@ limitations under the License. """ 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 @@ def _prepare_apexer_wrapper_inputs(ctx): # 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 index 7fa93b08..210a42fa 100644 --- a/rules/prebuilt_etc.bzl +++ b/rules/prebuilt_file.bzl @@ -14,19 +14,19 @@ See the License for the specific language governing permissions and 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 @@ def _prebuilt_etc_rule_impl(ctx): ), ] -_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 @@ _prebuilt_etc = rule( }, ) -def prebuilt_etc( +def prebuilt_file( name, src, sub_dir = None, @@ -55,7 +55,7 @@ def prebuilt_etc( **kwargs): "Bazel macro to correspond with the prebuilt_etc Soong module." - _prebuilt_etc( + _prebuilt_file( name = name, src = src, sub_dir = sub_dir, |