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

Merge "Use the apex image when the device config asks for it."

Browse Source
This commit is contained in:
Nicolas Geoffray
2019-04-05 09:34:34 +00:00
committed by Gerrit Code Review
parent b9045cf28c 25c0e03520
commit 56405f8071
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dexpreopt/config.go
View File

@@ -32,6 +32,7 @@ type GlobalConfig struct {
OnlyPreoptBootImageAndSystemServer bool // only preopt jars in the boot image or system server OnlyPreoptBootImageAndSystemServer bool // only preopt jars in the boot image or system server
GenerateApexImage bool // generate an extra boot image only containing jars from the runtime apex GenerateApexImage bool // generate an extra boot image only containing jars from the runtime apex
UseApexImage bool // use the apex image by default
HasSystemOther bool // store odex files that match PatternsOnSystemOther on the system_other partition HasSystemOther bool // store odex files that match PatternsOnSystemOther on the system_other partition
PatternsOnSystemOther []string // patterns (using '%' to denote a prefix match) to put odex on the system_other partition PatternsOnSystemOther []string // patterns (using '%' to denote a prefix match) to put odex on the system_other partition

3
java/dexpreopt.go
View File

@@ -98,6 +98,9 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
global := dexpreoptGlobalConfig(ctx) global := dexpreoptGlobalConfig(ctx)
bootImage := defaultBootImageConfig(ctx) bootImage := defaultBootImageConfig(ctx)
if global.UseApexImage {
bootImage = apexBootImageConfig(ctx)
}
var archs []android.ArchType var archs []android.ArchType
for _, a := range ctx.MultiTargets() { for _, a := range ctx.MultiTargets() {