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
This commit is contained in:
Nicolas Geoffray
2019-02-20 10:00:47 +00:00
parent e0233a5bdd
commit 39fe574a04
3 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

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

View File

@@ -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)