diff options
| author | Zhaoqing Xu <zhaoqxu@google.com> | 2023-05-15 09:26:12 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-05-15 09:26:51 -0700 |
| commit | 6358db6415cb05a0ce1dcd827da0aa1470900637 (patch) | |
| tree | 7a8b6a7e37f34b6a8a1835506532042037229556 | |
| parent | 88ac3334cab0bbff2ce10e8b76eaf988c27b966b (diff) | |
| download | bazelbuild-rules_android-6358db6415cb05a0ce1dcd827da0aa1470900637.tar.gz | |
Rename the filter_zip method to "filter_zip_include" to better reflect its purpose.
PiperOrigin-RevId: 532135446
Change-Id: Ib54d602a7ea46c835d5e76e57999e05769d717e8
| -rw-r--r-- | rules/android_application/android_application_rule.bzl | 4 | ||||
| -rw-r--r-- | rules/common.bzl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rules/android_application/android_application_rule.bzl b/rules/android_application/android_application_rule.bzl index ce3f321..0a931da 100644 --- a/rules/android_application/android_application_rule.bzl +++ b/rules/android_application/android_application_rule.bzl @@ -129,11 +129,11 @@ def _process_feature_module( # Extract libs/ from split binary native_libs = ctx.actions.declare_file(ctx.label.name + "/" + feature_target.label.name + "/native_libs.zip") - _common.filter_zip(ctx, binary, native_libs, ["lib/*"]) + _common.filter_zip_include(ctx, binary, native_libs, ["lib/*"]) # Extract AndroidManifest.xml and assets from res-ap_ filtered_res = ctx.actions.declare_file(ctx.label.name + "/" + feature_target.label.name + "/filtered_res.zip") - _common.filter_zip(ctx, res_apk, filtered_res, ["AndroidManifest.xml", "assets/*"]) + _common.filter_zip_include(ctx, res_apk, filtered_res, ["AndroidManifest.xml", "assets/*"]) # Merge into output _java.singlejar( diff --git a/rules/common.bzl b/rules/common.bzl index 508413f..cc4b1d6 100644 --- a/rules/common.bzl +++ b/rules/common.bzl @@ -43,7 +43,7 @@ def _get_host_javabase(ctx): _log.error("Missing _host_javabase attr") return ctx.attr._host_javabase -def _filter_zip(ctx, in_zip, out_zip, filters = []): +def _filter_zip_include(ctx, in_zip, out_zip, filters = []): """Creates a copy of a zip file with files that match filters.""" args = ctx.actions.args() args.add("-q") @@ -57,7 +57,7 @@ def _filter_zip(ctx, in_zip, out_zip, filters = []): arguments = [args], inputs = [in_zip], outputs = [out_zip], - mnemonic = "FilterZip", + mnemonic = "FilterZipInclude", progress_message = "Filtering %s" % in_zip.short_path, ) @@ -76,7 +76,7 @@ common = struct( create_signer_properties = _create_signer_properties, get_host_javabase = _get_host_javabase, get_java_toolchain = _get_java_toolchain, - filter_zip = _filter_zip, + filter_zip_include = _filter_zip_include, ) android_common = _native_android_common |