diff options
| author | 2023-05-12 10:48:44 +0000 | |
|---|---|---|
| committer | 2023-05-12 10:48:44 +0000 | |
| commit | 4abf2f45405ed8373b87d52133438cd2dd083b74 (patch) | |
| tree | 86c324fde9036b9d413cf4914db777a4823b3454 /java/java_test.go | |
| parent | f8fbff1671eaa0464e05561f91d952214540edef (diff) | |
| parent | c08c162b5a82ddfc44e9944d798636b2241308de (diff) | |
Merge changes from topic "boot-image-b280776428"
* changes:
Dexpreopt ART jars and framework jars together.
Unify installDirOnHost and installDirOnDevice.
Remove the ability to install boot images by bootclasspath_fragments.
Prepare tests for dexpreopt changes.
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/java_test.go b/java/java_test.go index 553b762ee..2a4913ecd 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -46,12 +46,11 @@ var prepareForJavaTest = android.GroupFixturePreparers( // Get the CC build components but not default modules. cc.PrepareForTestWithCcBuildComponents, // Include all the default java modules. - PrepareForTestWithJavaDefaultModules, + PrepareForTestWithDexpreopt, PrepareForTestWithOverlayBuildComponents, android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) { ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) }), - PrepareForTestWithDexpreopt, ) func TestMain(m *testing.M) { |