diff options
| author | Jingwen Chen <jingwen@google.com> | 2022-03-17 16:21:09 +0000 |
|---|---|---|
| committer | Jingwen Chen <jingwen@google.com> | 2022-03-21 10:15:27 +0000 |
| commit | 7e6d14b193ec4c3fb9a83128b0b718f6968ea9e6 (patch) | |
| tree | 2abff2c37194c63b6e1aabe2e79739350da298c8 | |
| parent | aa3f4a58239a0d07f8905e26bc33e779cc037427 (diff) | |
| download | bazel-7e6d14b193ec4c3fb9a83128b0b718f6968ea9e6.tar.gz | |
Use aapt2 prebuilt and remove it from make_injection.
Test: CI
Bug: 204244290
Change-Id: I6570684b6ddd3eaecc5eaec7994a2de0ef281c86
| -rw-r--r-- | bazel.WORKSPACE | 1 | ||||
| -rw-r--r-- | rules/apex.bzl | 3 | ||||
| -rw-r--r-- | rules/apex/BUILD | 4 | ||||
| -rw-r--r-- | rules/apex/mainline_modules.bzl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bazel.WORKSPACE b/bazel.WORKSPACE index 899e6fc4..38e0bb33 100644 --- a/bazel.WORKSPACE +++ b/bazel.WORKSPACE @@ -16,7 +16,6 @@ make_injection_repository( name = "make_injection", binaries = [ # APEX tools - "aapt2", "apex_compression_tool", "apexer", "conv_apex_manifest", diff --git a/rules/apex.bzl b/rules/apex.bzl index 4dbd86c9..ed514bd9 100644 --- a/rules/apex.bzl +++ b/rules/apex.bzl @@ -180,6 +180,7 @@ def _run_apexer(ctx, apex_toolchain, apex_content_inputs, bazel_apexer_wrapper_m apex_toolchain.apexer.dirname, # These are real Bazel targets + apex_toolchain.aapt2.dirname, avbtool_files.executable.dirname, e2fsdroid_files.executable.dirname, mke2fs_files.executable.dirname, @@ -206,10 +207,10 @@ def _run_apexer(ctx, apex_toolchain, apex_content_inputs, bazel_apexer_wrapper_m e2fsdroid_files, mke2fs_files, resize2fs_files, + apex_toolchain.aapt2, apex_toolchain.apexer, apex_toolchain.sefcontext_compile, - apex_toolchain.aapt2, ] if android_manifest != None: diff --git a/rules/apex/BUILD b/rules/apex/BUILD index 4d8a4b97..ef3998cd 100644 --- a/rules/apex/BUILD +++ b/rules/apex/BUILD @@ -23,7 +23,7 @@ toolchain_type(name = "apex_toolchain_type") apex_toolchain( name = "prebuilt_apex_toolchain", - aapt2 = "@make_injection//:host/linux-x86/bin/aapt2", + aapt2 = "//prebuilts/sdk/tools:linux/bin/aapt2", avbtool = "//external/avb:avbtool", apexer = "@make_injection//:host/linux-x86/bin/apexer", mke2fs = "//external/e2fsprogs/misc:mke2fs", @@ -68,7 +68,7 @@ sh_test( "//external/e2fsprogs/resize:resize2fs", "//external/e2fsprogs/debugfs:debugfs", "//prebuilts/build-tools:linux-x86/bin/soong_zip", - "@make_injection//:host/linux-x86/bin/aapt2", + "//prebuilts/sdk/tools:linux/bin/aapt2", "@make_injection//:host/linux-x86/bin/apex_compression_tool", "@make_injection//:host/linux-x86/bin/apexer", "@make_injection//:host/linux-x86/bin/conv_apex_manifest", diff --git a/rules/apex/mainline_modules.bzl b/rules/apex/mainline_modules.bzl index a4f621b0..268a5fd2 100644 --- a/rules/apex/mainline_modules.bzl +++ b/rules/apex/mainline_modules.bzl @@ -237,7 +237,7 @@ apex_aab = rule( allow_single_file = True, cfg = "host", executable = True, - default = "@make_injection//:host/linux-x86/bin/aapt2", + default = "//prebuilts/sdk/tools:linux/bin/aapt2", ), "_merge_zips": attr.label( allow_single_file = True, |