From c67528bf7e236d8789c356ba75f408e69561506e Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Thu, 11 May 2023 16:39:27 +0100 Subject: Prepare tests for dexpreopt changes. After this change, there is a clear separation between tests that are related to dexpreopt and tests that are not. The former uses PrepareForTestWithDexpreopt, while the latter uses PrepareForTestWithJavaDefaultModules. The benefit is that the latter will no longer affected by any dexpreopt changes. Bug: 280776428 Test: m nothing (cherry picked from https://android-review.googlesource.com/q/commit:b95998be731406209f18fab764b96421a17ab4c9) Merged-In: Ib957765b9287d51c082e0a33cee17a6bb56daeef Change-Id: Ib957765b9287d51c082e0a33cee17a6bb56daeef --- java/java_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'java/java_test.go') 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) { -- cgit v1.2.3-59-g8ed1b