diff options
author | Jingwen Chen <jingwen@google.com> | 2022-12-20 08:46:57 +0000 |
---|---|---|
committer | Jingwen Chen <jingwen@google.com> | 2023-01-05 08:44:08 +0000 |
commit | 70959aea8af42078aa971ce6db47d50f4a524f3b (patch) | |
tree | b5fef48ed041a8f5dea9af956937dedecaddd3a6 /rules/apex/bundle.bzl | |
parent | de8444b53dea6faa49ce7af3ff1c7432fe4b3997 (diff) | |
download | bazel-70959aea8af42078aa971ce6db47d50f4a524f3b.tar.gz |
Add APEX metadata files into aab output group.
This enables these files to be dist'd using the copy_to_dist_dir rule
and a filegroup.
$ b build //build/bazel/vendor/google:build.bazel.examples.apex.minimal_apex_aab --output_groups=apex_files --config=android
This produces the following layout:
$ tree bazel-bin/build/bazel/vendor/google/
bazel-bin/build/bazel/vendor/google/
├── mainline_modules_arm
│ ├── build.bazel.examples.apex.minimal.apex
│ ├── build.bazel.examples.apex.minimal-base.zip
│ ├── java_apis_usedby_apex
│ │ └── build.bazel.examples.apex.minimal_using.xml
│ ├── ndk_apis_backedby_apex
│ │ └── build.bazel.examples.apex.minimal_backing.txt
│ └── ndk_apis_usedby_apex
│ └── build.bazel.examples.apex.minimal_using.txt
├── mainline_modules_arm64
│ ├── build.bazel.examples.apex.minimal.apex
│ ├── build.bazel.examples.apex.minimal-base.zip
│ ├── java_apis_usedby_apex
│ │ └── build.bazel.examples.apex.minimal_using.xml
│ ├── ndk_apis_backedby_apex
│ │ └── build.bazel.examples.apex.minimal_backing.txt
│ └── ndk_apis_usedby_apex
│ └── build.bazel.examples.apex.minimal_using.txt
├── mainline_modules_x86
│ ├── build.bazel.examples.apex.minimal.apex
│ ├── build.bazel.examples.apex.minimal-base.zip
│ ├── java_apis_usedby_apex
│ │ └── build.bazel.examples.apex.minimal_using.xml
│ ├── ndk_apis_backedby_apex
│ │ └── build.bazel.examples.apex.minimal_backing.txt
│ └── ndk_apis_usedby_apex
│ └── build.bazel.examples.apex.minimal_using.txt
└── mainline_modules_x86_64
├── build.bazel.examples.apex.minimal.apex
├── build.bazel.examples.apex.minimal-base.zip
├── java_apis_usedby_apex
│ └── build.bazel.examples.apex.minimal_using.xml
├── ndk_apis_backedby_apex
│ └── build.bazel.examples.apex.minimal_backing.txt
└── ndk_apis_usedby_apex
└── build.bazel.examples.apex.minimal_using.txt
Fixes: 262267828
Fixes: 262267670
Fixes: 262267551
Test: mainline build script with --bazel-mode.
Change-Id: I67e9afff09d681a6ddf761889fa72524d5a8f713
Diffstat (limited to 'rules/apex/bundle.bzl')
-rw-r--r-- | rules/apex/bundle.bzl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/apex/bundle.bzl b/rules/apex/bundle.bzl index 33615298..5decfc2a 100644 --- a/rules/apex/bundle.bzl +++ b/rules/apex/bundle.bzl @@ -71,7 +71,7 @@ def _base_file(actions, name, zip2zip, arch, apex_proto_file): """Run zip2zip to transform the apex file the expected directory structure with all files that will be included in the base module of aab file.""" - output_file = actions.declare_file(name + ".base") + output_file = actions.declare_file(name + "-base.zip") # Arguments args = actions.args() |