diff options
| author | 2023-12-08 10:57:22 +0000 | |
|---|---|---|
| committer | 2023-12-08 10:57:22 +0000 | |
| commit | 1befeeb5e8684ad5aa6efc7273edaab2a89d2055 (patch) | |
| tree | 6c122c1a4e6d9e4c692b9e4ff6c05827dfbf8447 /java/java_test.go | |
| parent | ce96639b982ac4a3b45031d79eebcd4b6fa0ae70 (diff) | |
| parent | 1ed5d5ca20017d31857a2ab3079a72078a2bba45 (diff) | |
Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d am: 1ed5d5ca20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663
Change-Id: Iacd72283671593f0914420024451a347d9125c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) { |