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

Merge "Move the intermediate directory for ART boot images." am: f657ff1d00 am: 1cbe84940c am: 607ac2fc5a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1461622

Change-Id: I258b0a9bcb151d882e463387a2292f53bbdcb15b
This commit is contained in:
Martin Stjernholm
2020-10-20 20:28:03 +00:00
committed by Automerger Merge Worker
parent 2ecc4e18cd 607ac2fc5a
commit e8490a11b4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/dexpreopt_bootjars_test.go
View File

@@ -87,7 +87,7 @@ func TestDexpreoptBootJars(t *testing.T) {
ruleFile := "boot-foo.art" ruleFile := "boot-foo.art"
expectedInputs := []string{ expectedInputs := []string{
"dex_artjars/android/apex/com.android.art/javalib/arm64/boot.art", "dex_artjars/android/apex/art_boot_images/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",

2
java/dexpreopt_config.go
View File

@@ -89,7 +89,7 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig {
frameworkModules := global.BootJars.CopyOf() frameworkModules := global.BootJars.CopyOf()
frameworkModules.RemoveList(artModules) frameworkModules.RemoveList(artModules)
artSubdir := "apex/com.android.art/javalib" artSubdir := "apex/art_boot_images/javalib"
frameworkSubdir := "system/framework" frameworkSubdir := "system/framework"
// ART config for the primary boot image in the ART apex. // ART config for the primary boot image in the ART apex.