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

Merge "Revert^2 "Use boot image extension for framework libraries."" am: a773c39bfc am: 4e1c74edce

Browse Source 
Change-Id: Iee482e79d2098988ad08e8eb64bf23a8052aaf5b
This commit is contained in:
Automerger Merge Worker
2020-01-09 13:29:33 +00:00
parent c2f316b759 4e1c74edce
commit 18114bcee6
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/dexpreopt_bootjars_test.go
View File

@@ -48,7 +48,7 @@ func TestDexpreoptBootJars(t *testing.T) {
pathCtx := android.PathContextForTesting(config) pathCtx := android.PathContextForTesting(config)
dexpreoptConfig := dexpreopt.GlobalConfigForTests(pathCtx) dexpreoptConfig := dexpreopt.GlobalConfigForTests(pathCtx)
dexpreoptConfig.ArtApexJars = []string{"foo", "bar", "baz"} dexpreoptConfig.BootJars = []string{"foo", "bar", "baz"}
setDexpreoptTestGlobalConfig(config, dexpreoptConfig) setDexpreoptTestGlobalConfig(config, dexpreoptConfig)
ctx := testContext() ctx := testContext()
@@ -59,9 +59,10 @@ func TestDexpreoptBootJars(t *testing.T) {
dexpreoptBootJars := ctx.SingletonForTests("dex_bootjars") dexpreoptBootJars := ctx.SingletonForTests("dex_bootjars")
bootArt := dexpreoptBootJars.Output("boot.art") bootArt := dexpreoptBootJars.Output("boot-foo.art")
expectedInputs := []string{ expectedInputs := []string{
"dex_artjars/apex/com.android.art/javalib/arm64/boot.art",
"dex_bootjars_input/foo.jar", "dex_bootjars_input/foo.jar",
"dex_bootjars_input/bar.jar", "dex_bootjars_input/bar.jar",
"dex_bootjars_input/baz.jar", "dex_bootjars_input/baz.jar",
@@ -82,19 +83,19 @@ func TestDexpreoptBootJars(t *testing.T) {
expectedOutputs := []string{ expectedOutputs := []string{
"dex_bootjars/system/framework/arm64/boot.invocation", "dex_bootjars/system/framework/arm64/boot.invocation",
"dex_bootjars/system/framework/arm64/boot.art", "dex_bootjars/system/framework/arm64/boot-foo.art",
"dex_bootjars/system/framework/arm64/boot-bar.art", "dex_bootjars/system/framework/arm64/boot-bar.art",
"dex_bootjars/system/framework/arm64/boot-baz.art", "dex_bootjars/system/framework/arm64/boot-baz.art",
"dex_bootjars/system/framework/arm64/boot.oat", "dex_bootjars/system/framework/arm64/boot-foo.oat",
"dex_bootjars/system/framework/arm64/boot-bar.oat", "dex_bootjars/system/framework/arm64/boot-bar.oat",
"dex_bootjars/system/framework/arm64/boot-baz.oat", "dex_bootjars/system/framework/arm64/boot-baz.oat",
"dex_bootjars/system/framework/arm64/boot.vdex", "dex_bootjars/system/framework/arm64/boot-foo.vdex",
"dex_bootjars/system/framework/arm64/boot-bar.vdex", "dex_bootjars/system/framework/arm64/boot-bar.vdex",
"dex_bootjars/system/framework/arm64/boot-baz.vdex", "dex_bootjars/system/framework/arm64/boot-baz.vdex",
"dex_bootjars_unstripped/system/framework/arm64/boot.oat", "dex_bootjars_unstripped/system/framework/arm64/boot-foo.oat",
"dex_bootjars_unstripped/system/framework/arm64/boot-bar.oat", "dex_bootjars_unstripped/system/framework/arm64/boot-bar.oat",
"dex_bootjars_unstripped/system/framework/arm64/boot-baz.oat", "dex_bootjars_unstripped/system/framework/arm64/boot-baz.oat",
} }

14
java/dexpreopt_config.go
View File

@@ -167,15 +167,15 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig {
} }
// Framework config for the boot image extension. // Framework config for the boot image extension.
// It includes both the Core libraries and framework. // It includes framework libraries and depends on the ART config.
frameworkCfg := bootImageConfig{ frameworkCfg := bootImageConfig{
extension: false, extension: true,
name: frameworkBootImageName, name: frameworkBootImageName,
stem: "boot", stem: "boot",
installSubdir: frameworkSubdir, installSubdir: frameworkSubdir,
modules: concat(artModules, frameworkModules), modules: frameworkModules,
dexLocations: concat(artLocations, frameworkLocations), dexLocations: frameworkLocations,
dexLocationsDeps: concat(artLocations, frameworkLocations), dexLocationsDeps: append(artLocations, frameworkLocations...),
} }
// Apex config for the boot image used in the JIT-zygote experiment. // Apex config for the boot image used in the JIT-zygote experiment.
@@ -231,6 +231,10 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig {
c.zip = c.dir.Join(ctx, c.name+".zip") c.zip = c.dir.Join(ctx, c.name+".zip")
} }
// specific to the framework config
frameworkCfg.dexPathsDeps = append(artCfg.dexPathsDeps, frameworkCfg.dexPathsDeps...)
frameworkCfg.imageLocations = append(artCfg.imageLocations, frameworkCfg.imageLocations...)
return configs return configs
}).(map[string]*bootImageConfig) }).(map[string]*bootImageConfig)
} }