diff options
| author | Jiyong Park <jiyong@google.com> | 2020-09-17 15:38:40 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-09-17 16:02:59 +0900 |
| commit | e2d790f9220f2b676e5e20674fb76dc5628cbec2 (patch) | |
| tree | 47962c90467eb2b003f02eebc988996e903dfd76 | |
| parent | 3c59c582164b4561d34d521dedfee4cd2034caad (diff) | |
| download | platform_system_apex-e2d790f9220f2b676e5e20674fb76dc5628cbec2.tar.gz platform_system_apex-e2d790f9220f2b676e5e20674fb76dc5628cbec2.tar.bz2 platform_system_apex-e2d790f9220f2b676e5e20674fb76dc5628cbec2.zip | |
Enable com.android.support.apexer only for linux_glibc_x86_64 target
With the addition of linux_bionic_arm64 host target, this test apex
automatically gets enabled for the cross host target. However, some
dependencies of this apex like soong_zip, etc. are not available for the
cross-host target. As a result, we get the following errors:
error: system/apex/apexer/Android.bp:104:1: dependency "merge_zips" of
"com.android.support.apexer" missing variant:
os:linux_bionic, arch:arm64
available variants:
os:linux_glibc, arch:x86_64
error: system/apex/apexer/Android.bp:104:1: dependency "soong_zip"
of "com.android.support.apexer" missing variant:
os:linux_bionic, arch:arm64
available variants:
os:linux_glibc, arch:x86_64
Fix the problem by disabling this apex for targets where the tools are
not available.
Bug: 159685774
Test: HOST_CROSS_OS=linux_bionic HOST_CROSS_ARCH=arm64 m
Change-Id: Ie79b116438da3b08d3aba65391affa409a3dfa36
| -rw-r--r-- | apexer/Android.bp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apexer/Android.bp b/apexer/Android.bp index 29537542..03fdbd6a 100644 --- a/apexer/Android.bp +++ b/apexer/Android.bp @@ -110,6 +110,12 @@ apex_test { ignore_system_library_special_case: true, key: "com.android.support.apexer.key", binaries: apexer_tools + apexer_go_tools, + enabled: false, + target: { + linux_glibc_x86_64: { + enabled: true, + }, + }, } // TODO(b/148659029): this test can't run in TEST_MAPPING. |