diff options
author | 2023-12-01 22:01:06 +0000 | |
---|---|---|
committer | 2023-12-07 23:01:26 +0000 | |
commit | 84b2589e6dc85d15af273b8a293ed7f064142af7 (patch) | |
tree | bcdd1a9808f4eaa9c221dd44b8481e308c2e7498 /java/java_test.go | |
parent | cca3e0c4b56b7620dee8f2dcf76b7b6682d8ebe8 (diff) |
Add aconfig flag support for android_app
This change adds an overrideable property flags_packages to android_app,
which is used to list the aconfig_declarations module names that the app
depends on. The build action of android_app is modified to pass all
flags text file provided by the aconfig_declarations to aapt2 link as
--feature-flags arguments.
Test: m nothing --no-skip-soong-tests
Bug: 306024510
Change-Id: I4924f88b9954950cc1936a472cd7ac70f41add5d
Diffstat (limited to 'java/java_test.go')
-rw-r--r-- | java/java_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index 0c750ebe1..d4b056bc9 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -26,6 +26,7 @@ import ( "github.com/google/blueprint/proptools" + "android/soong/aconfig" "android/soong/android" "android/soong/cc" "android/soong/dexpreopt" @@ -47,6 +48,8 @@ var prepareForJavaTest = android.GroupFixturePreparers( cc.PrepareForTestWithCcBuildComponents, // Include all the default java modules. PrepareForTestWithDexpreopt, + // Include aconfig modules. + aconfig.PrepareForTestWithAconfigBuildComponents, ) func TestMain(m *testing.M) { |