diff options
| author | 2023-12-08 10:27:20 +0000 | |
|---|---|---|
| committer | 2023-12-08 10:27:20 +0000 | |
| commit | 1ed5d5ca20017d31857a2ab3079a72078a2bba45 (patch) | |
| tree | 80ba8f55092cc45b04f4b99d2a40de8de7e6fb57 /java/java_test.go | |
| parent | 08f46ee8d466c794054cffb3367844020a1b3f45 (diff) | |
| parent | 25c187cc7dfb70a88a8b4fade245fa24cc9e1dcf (diff) | |
Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663
Change-Id: I0d9212e36959c7964e6cbff7228b5ff5dabad32a
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) { |