diff options
| author | 2024-10-22 16:30:57 -0700 | |
|---|---|---|
| committer | 2024-10-22 16:33:35 -0700 | |
| commit | 5aeb9fd4d89e9ee3911fc61b29a6b04d693734ed (patch) | |
| tree | 0ebe58916155129fff486698b06bc94b4ea72fd6 /packages/CtsShim | |
| parent | 397dfb6e026e3a00167168d5bef7903fddc32082 (diff) | |
Remove dependencies on the 1-variant fallback
When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.
Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
Change-Id: I305d9a549fc132c3d14f56eae1abbac1b9defd10
Diffstat (limited to 'packages/CtsShim')
| -rw-r--r-- | packages/CtsShim/build/Android.bp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp index 5b3d47e9f74d..bd892637a5eb 100644 --- a/packages/CtsShim/build/Android.bp +++ b/packages/CtsShim/build/Android.bp @@ -55,7 +55,7 @@ android_app { ], } -genrule { +java_genrule { name: "generate_priv_manifest", srcs: [ "shim_priv/AndroidManifest.xml", @@ -169,7 +169,7 @@ android_app { min_sdk_version: "24", } -genrule { +java_genrule { name: "generate_shim_manifest", srcs: [ "shim/AndroidManifest.xml", |