From 5aeb9fd4d89e9ee3911fc61b29a6b04d693734ed Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 22 Oct 2024 16:30:57 -0700 Subject: 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 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libs/androidfw/Android.bp') diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 77800a305f02..15ef58ecf3bd 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -258,6 +258,8 @@ cc_test { "tests/data/**/*.apk", "tests/data/**/*.arsc", "tests/data/**/*.idmap", + ], + device_common_data: [ ":FrameworkResourcesSparseTestApp", ":FrameworkResourcesNotSparseTestApp", ], -- cgit v1.2.3-59-g8ed1b