Set a dedicated variable for the runtime apex libs.
Bug: 124789867
Test: build with coverage, the boot classpath has jacoco.jar in /system/framework, not the apex
Change-Id: Iaa0762b5a674282be95710d0e1fb166a58ec893b
diff --git a/dexpreopt/config.go b/dexpreopt/config.go
index 0eb162d..ee3cc8d 100644
--- a/dexpreopt/config.go
+++ b/dexpreopt/config.go
@@ -36,7 +36,7 @@
BootJars []string // modules for jars that form the boot class path
- TargetCoreJars []string // modules for jars that are in the runtime apex
+ RuntimeApexJars []string // modules for jars that are in the runtime apex
ProductUpdatableBootModules []string
ProductUpdatableBootLocations []string
diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go
index a2c6f77..949f91f 100644
--- a/dexpreopt/dexpreopt_test.go
+++ b/dexpreopt/dexpreopt_test.go
@@ -29,7 +29,7 @@
PatternsOnSystemOther: nil,
DisableGenerateProfile: false,
BootJars: nil,
- TargetCoreJars: nil,
+ RuntimeApexJars: nil,
ProductUpdatableBootModules: nil,
ProductUpdatableBootLocations: nil,
SystemServerJars: nil,
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 0656ff4..05868da 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -113,7 +113,7 @@
}
func computeBootClasspath(ctx android.PathContext, info *bootJarsInfo) {
- runtimeModules := android.RemoveListFromList(info.global.TargetCoreJars, info.global.ProductUpdatableBootModules)
+ runtimeModules := info.global.RuntimeApexJars
nonFrameworkModules := concat(runtimeModules, info.global.ProductUpdatableBootModules)
frameworkModules := android.RemoveListFromList(info.global.BootJars, nonFrameworkModules)