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

Merge "Fix --boot-image argument in dex2oat command for boot image extension."

Browse Source 
am: 911083e3e1

Change-Id: I11c4bedcf0ca964f412d19cb9152eb94ca2fc5b1
This commit is contained in:
Ulyana Trafimovich
2020-01-28 09:20:47 -08:00
committed by android-build-merger
parent 3afe2c13a0 911083e3e1
commit 00cc7b0b4d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/dexpreopt_bootjars.go
View File

@@ -88,6 +88,9 @@ type bootImageConfig struct {
images map[android.ArchType]android.OutputPath // first image file images map[android.ArchType]android.OutputPath // first image file
imagesDeps map[android.ArchType]android.OutputPaths // all files imagesDeps map[android.ArchType]android.OutputPaths // all files
// Only for extensions, paths to the primary boot images (grouped by target).
primaryImages map[android.ArchType]android.OutputPath
// File path to a zip archive with all image files (or nil, if not needed). // File path to a zip archive with all image files (or nil, if not needed).
zip android.WritablePath zip android.WritablePath
} }
@@ -355,7 +358,7 @@ func buildBootImageRuleForArch(ctx android.SingletonContext, image *bootImage,
} }
if image.extension { if image.extension {
artImage := artBootImageConfig(ctx).images[arch] artImage := image.primaryImages[arch]
cmd. cmd.
Flag("--runtime-arg").FlagWithInputList("-Xbootclasspath:", image.dexPathsDeps.Paths(), ":"). Flag("--runtime-arg").FlagWithInputList("-Xbootclasspath:", image.dexPathsDeps.Paths(), ":").
Flag("--runtime-arg").FlagWithList("-Xbootclasspath-locations:", image.dexLocationsDeps, ":"). Flag("--runtime-arg").FlagWithList("-Xbootclasspath-locations:", image.dexLocationsDeps, ":").

2
java/dexpreopt_config.go
View File

@@ -246,10 +246,12 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig {
// specific to the framework config // specific to the framework config
frameworkCfg.dexPathsDeps = append(artCfg.dexPathsDeps, frameworkCfg.dexPathsDeps...) frameworkCfg.dexPathsDeps = append(artCfg.dexPathsDeps, frameworkCfg.dexPathsDeps...)
frameworkCfg.primaryImages = artCfg.images
frameworkCfg.imageLocations = append(artCfg.imageLocations, frameworkCfg.imageLocations...) frameworkCfg.imageLocations = append(artCfg.imageLocations, frameworkCfg.imageLocations...)
// specific to the jitzygote-framework config // specific to the jitzygote-framework config
frameworkJZCfg.dexPathsDeps = append(artJZCfg.dexPathsDeps, frameworkJZCfg.dexPathsDeps...) frameworkJZCfg.dexPathsDeps = append(artJZCfg.dexPathsDeps, frameworkJZCfg.dexPathsDeps...)
frameworkJZCfg.primaryImages = artJZCfg.images
frameworkJZCfg.imageLocations = append(artJZCfg.imageLocations, frameworkJZCfg.imageLocations...) frameworkJZCfg.imageLocations = append(artJZCfg.imageLocations, frameworkJZCfg.imageLocations...)
return configs return configs