StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2020-02-13 10:53:13 +00:00
committed by Android (Google) Code Review
parent 768608acea ef4358e536
commit e749814af8
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/dexpreopt_config.go
View File

@@ -115,16 +115,16 @@ func stemOf(moduleName string) string {
func getJarsFromApexJarPairs(apexJarPairs []string) []string {
modules := make([]string, len(apexJarPairs))
for i, p := range apexJarPairs {
_, jar := dexpreopt.SplitApexJarPair(p)
_, jar := android.SplitApexJarPair(p)
modules[i] = jar
}
return modules
}
var (
bootImageConfigKey = android.NewOnceKey("bootImageConfig")
artBootImageName = "art"
frameworkBootImageName = "boot"
bootImageConfigKey = android.NewOnceKey("bootImageConfig")
artBootImageName = "art"
frameworkBootImageName = "boot"
)
// Construct the global boot image configs.
@@ -179,8 +179,8 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig {
}
configs := map[string]*bootImageConfig{
artBootImageName: &artCfg,
frameworkBootImageName: &frameworkCfg,
artBootImageName: &artCfg,
frameworkBootImageName: &frameworkCfg,
}
// common to all configs