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

Update dexpreopt for the ART APEX name change.

Browse Source 
Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: I3aac9112b022cce3ef8cfdf4bdbbed8bb0c8f4c7
Merged-In: I3aac9112b022cce3ef8cfdf4bdbbed8bb0c8f4c7
This commit is contained in:
Martin Stjernholm
2019-07-05 22:38:25 +01:00
parent 7153b767a5
commit cc4b0ad706
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/dexpreopt_config.go
View File

@@ -107,17 +107,17 @@ func defaultBootImageConfig(ctx android.PathContext) bootImageConfig {
return ctx.Config().Once(defaultBootImageConfigKey, func() interface{} {
global := dexpreoptGlobalConfig(ctx)
runtimeModules := global.RuntimeApexJars
nonFrameworkModules := concat(runtimeModules, global.ProductUpdatableBootModules)
artModules := global.ArtApexJars
nonFrameworkModules := concat(artModules, global.ProductUpdatableBootModules)
frameworkModules := android.RemoveListFromList(global.BootJars, nonFrameworkModules)
var nonUpdatableBootModules []string
var nonUpdatableBootLocations []string
for _, m := range runtimeModules {
for _, m := range artModules {
nonUpdatableBootModules = append(nonUpdatableBootModules, m)
nonUpdatableBootLocations = append(nonUpdatableBootLocations,
filepath.Join("/apex/com.android.runtime/javalib", m+".jar"))
filepath.Join("/apex/com.android.art/javalib", m+".jar"))
}
for _, m := range frameworkModules {
@@ -176,16 +176,16 @@ func apexBootImageConfig(ctx android.PathContext) bootImageConfig {
return ctx.Config().Once(apexBootImageConfigKey, func() interface{} {
global := dexpreoptGlobalConfig(ctx)
runtimeModules := global.RuntimeApexJars
nonFrameworkModules := concat(runtimeModules, global.ProductUpdatableBootModules)
artModules := global.ArtApexJars
nonFrameworkModules := concat(artModules, global.ProductUpdatableBootModules)
frameworkModules := android.RemoveListFromList(global.BootJars, nonFrameworkModules)
imageModules := concat(runtimeModules, frameworkModules)
imageModules := concat(artModules, frameworkModules)
var bootLocations []string
for _, m := range runtimeModules {
for _, m := range artModules {
bootLocations = append(bootLocations,
filepath.Join("/apex/com.android.runtime/javalib", m+".jar"))
filepath.Join("/apex/com.android.art/javalib", m+".jar"))
}
for _, m := range frameworkModules {