diff options
| author | 2023-07-12 16:51:57 +0100 | |
|---|---|---|
| committer | 2023-07-14 12:13:30 +0100 | |
| commit | 556bdf8e965f1db04ec9862b590aad2d065e9bec (patch) | |
| tree | aed7ba34419caf8a43fa76f443dca5c00e9f9f73 /java/dexpreopt_config.go | |
| parent | 4d90da29a887f8919a0ad931d2045814e9e5ac65 (diff) | |
Add a Make variable to determine ART boot image jars for testing.
Bug: 290583827
Test: m nothing
Change-Id: I6eb0c83dd14682905ebaf3af55171856300eb2e3
Diffstat (limited to 'java/dexpreopt_config.go')
| -rw-r--r-- | java/dexpreopt_config.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 842f39275..0f4bd9b34 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -58,8 +58,7 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig return ctx.Config().Once(bootImageConfigRawKey, func() interface{} { global := dexpreopt.GetGlobalConfig(ctx) - artBootImageName := "art" // Keep this local to avoid accidental references. - artModules := global.ArtApexJars + artBootImageName := "art" // Keep this local to avoid accidental references. frameworkModules := global.BootJars // This includes `global.ArtApexJars`. mainlineBcpModules := global.ApexBootJars frameworkSubdir := "system/framework" @@ -72,7 +71,7 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig enabledIfExists: "art-bootclasspath-fragment", stem: bootImageStem, installDir: "apex/art_boot_images/javalib", - modules: artModules, + modules: global.TestOnlyArtBootImageJars, preloadedClassesFile: "art/build/boot/preloaded-classes", compilerFilter: "speed-profile", singleImage: false, |