diff options
| author | 2023-05-12 13:49:11 +0000 | |
|---|---|---|
| committer | 2023-05-12 13:49:11 +0000 | |
| commit | b0b019ed360889d024c25eaf70fa67e557ed6c07 (patch) | |
| tree | 0d9988bc29c3d7e2b150215364e0e879981fc3ca /java/testing.go | |
| parent | 6eea4a696720543337ddfe051370809ea6d4858b (diff) | |
| parent | c67528bf7e236d8789c356ba75f408e69561506e (diff) | |
Prepare tests for dexpreopt changes. am: c67528bf7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23206714
Change-Id: I03f2d2e43c613e25544710a604a51556f4ae9289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/java/testing.go b/java/testing.go index f68e12ff4..4ff2aa497 100644 --- a/java/testing.go +++ b/java/testing.go @@ -80,9 +80,7 @@ var prepareForTestWithFrameworkDeps = android.GroupFixturePreparers( }.AddToFixture(), ) -// Test fixture preparer that will define all default java modules except the -// fake_tool_binary for dex2oatd. -var PrepareForTestWithJavaDefaultModulesWithoutFakeDex2oatd = android.GroupFixturePreparers( +var prepareForTestWithJavaDefaultModulesBase = android.GroupFixturePreparers( // Make sure that all the module types used in the defaults are registered. PrepareForTestWithJavaBuildComponents, prepareForTestWithFrameworkDeps, @@ -92,13 +90,21 @@ var PrepareForTestWithJavaDefaultModulesWithoutFakeDex2oatd = android.GroupFixtu // Test fixture preparer that will define default java modules, e.g. standard prebuilt modules. var PrepareForTestWithJavaDefaultModules = android.GroupFixturePreparers( - PrepareForTestWithJavaDefaultModulesWithoutFakeDex2oatd, - dexpreopt.PrepareForTestWithFakeDex2oatd, + prepareForTestWithJavaDefaultModulesBase, + dexpreopt.FixtureDisableDexpreoptBootImages(true), + dexpreopt.FixtureDisableDexpreopt(true), ) // Provides everything needed by dexpreopt. var PrepareForTestWithDexpreopt = android.GroupFixturePreparers( - PrepareForTestWithJavaDefaultModules, + prepareForTestWithJavaDefaultModulesBase, + dexpreopt.PrepareForTestWithFakeDex2oatd, + dexpreopt.PrepareForTestByEnablingDexpreopt, +) + +// Provides everything needed by dexpreopt except the fake_tool_binary for dex2oatd. +var PrepareForTestWithDexpreoptWithoutFakeDex2oatd = android.GroupFixturePreparers( + prepareForTestWithJavaDefaultModulesBase, dexpreopt.PrepareForTestByEnablingDexpreopt, ) |