commit 5aeb9fd4d89e9ee3911fc61b29a6b04d693734ed
author Cole Faust <colefaust@google.com> Tue Oct 22 16:30:57 2024 -0700
committer Cole Faust <colefaust@google.com> Tue Oct 22 16:33:35 2024 -0700
tree 0ebe58916155129fff486698b06bc94b4ea72fd6
parent 397dfb6e026e3a00167168d5bef7903fddc32082

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

libs/androidfw/Android.bp

diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp
index 77800a3..15ef58e 100644
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -258,6 +258,8 @@
         "tests/data/**/*.apk",
         "tests/data/**/*.arsc",
         "tests/data/**/*.idmap",
+    ],
+    device_common_data: [
         ":FrameworkResourcesSparseTestApp",
         ":FrameworkResourcesNotSparseTestApp",
     ],