Merge "Set a dedicated variable for the runtime apex libs."

dexpreopt/config.go

@@ -36,7 +36,7 @@ type GlobalConfig struct {
 
 	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
 

dexpreopt/dexpreopt_test.go

@@ -29,7 +29,7 @@ var testGlobalConfig = GlobalConfig{
 	PatternsOnSystemOther:              nil,
 	DisableGenerateProfile:             false,
 	BootJars:                           nil,
-	TargetCoreJars:                     nil,
+	RuntimeApexJars:                    nil,
 	ProductUpdatableBootModules:        nil,
 	ProductUpdatableBootLocations:      nil,
 	SystemServerJars:                   nil,

java/dexpreopt_bootjars.go

@@ -113,7 +113,7 @@ func concat(lists ...[]string) []string {
 }
 
 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)