diff options
| author | Jingwen Chen <jingwen@google.com> | 2023-03-03 09:22:56 +0000 |
|---|---|---|
| committer | Jingwen Chen <jingwen@google.com> | 2023-03-07 04:54:39 +0000 |
| commit | bc51c4d1416cd3e7957a41e1c51bf7d6d92f88b9 (patch) | |
| tree | df8383a9763a961975425e6f21e7b84cf6b9d5e6 /rules/apex/apex_aab_test.bzl | |
| parent | df88977c50b821b8b1b74e3e955e357843ef43cc (diff) | |
| download | bazel-bc51c4d1416cd3e7957a41e1c51bf7d6d92f88b9.tar.gz | |
Add arm64only and x86_64only transitions to aab builds.
Also add support to producing apex bundle base zips with the right names
for 64+32 packages. Verified all of these with filelist diff tests.
For example:
$ zipinfo -1 bazel-bin/build/bazel/vendor/google/build.bazel.examples.apex.minimal/build.bazel.examples.apex.minimal.aab
BundleConfig.pb
base/apex/armeabi-v7a.img
base/apex/armeabi-v7a.build_info.pb
base/root/apex_manifest.pb
base/assets/NOTICE.html.gz
base/apex/arm64-v8a.armeabi-v7a.img
base/apex/arm64-v8a.armeabi-v7a.build_info.pb
base/apex/arm64-v8a.img
base/apex/arm64-v8a.build_info.pb
base/apex/x86.img
base/apex/x86.build_info.pb
base/apex/x86_64.x86.img
base/apex/x86_64.x86.build_info.pb
base/apex/x86_64.img
base/apex/x86_64.build_info.pb
base/manifest/AndroidManifest.xml
base/assets.pb
base/apex.pb
Also remove tests that are doing binary diffing - we're excluding
everything, which makes the test not useful at all. Plus we don't have a
goal of keeping everything bit for bit identical, as long as we
understand where the differences lie.
Also remove shell-based apex_aab_test for filelist diffing. The BUILD
diff_test is much easier to maintain and debug.
Test: new filelist diff tests
Bug: 268335710
Fixes: 271424450
Fixes: 271421585
Change-Id: I43e3297952817e5df32ba2ccf926a98ee8ecc973
Diffstat (limited to 'rules/apex/apex_aab_test.bzl')
| -rw-r--r-- | rules/apex/apex_aab_test.bzl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/apex/apex_aab_test.bzl b/rules/apex/apex_aab_test.bzl index 5b681485..d4cd0451 100644 --- a/rules/apex/apex_aab_test.bzl +++ b/rules/apex/apex_aab_test.bzl @@ -93,7 +93,7 @@ def _test_apex_aab_apex_files_output_group(): ) expected_paths = [] - for arch in ["arm", "arm64", "x86", "x86_64"]: + for arch in ["arm", "arm64", "x86", "x86_64", "arm64only", "x86_64only"]: paths = [ "/".join([native.package_name(), "mainline_modules_" + arch, basename]) for basename in [ |