tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass DEXPREOPT_BOOT_JARS_MODULES to Make am: 9be4152c21

Browse source 
am: 2b34ef2fd3

Change-Id: Ia5985fc3015d47c9a4ac832fbe64113d2f28ee33
This commit is contained in:
Colin Cross 2019-02-22 20:32:01 -08:00 committed by android-build-merger
commit edc6b9c1e0
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/config.go
View file

@ -775,10 +775,6 @@ func (c *config) BootJars() []string {
return c.productVariables.BootJars
}
func (c *config) PreoptBootJars() []string {
return c.productVariables.PreoptBootJars
}
func (c *config) DexpreoptGlobalConfig() string {
return String(c.productVariables.DexpreoptGlobalConfig)
}

3
android/variable.go
View file

@ -200,8 +200,7 @@ type productVariables struct {
UncompressPrivAppDex *bool `json:",omitempty"`
ModulesLoadedByPrivilegedModules []string `json:",omitempty"`
BootJars []string `json:",omitempty"`
PreoptBootJars []string `json:",omitempty"`
BootJars []string `json:",omitempty"`
IntegerOverflowExcludePaths []string `json:",omitempty"`

2
java/dexpreopt_config.go
View file

@ -151,4 +151,6 @@ func init() {
func dexpreoptConfigMakevars(ctx android.MakeVarsContext) {
ctx.Strict("PRODUCT_BOOTCLASSPATH", strings.Join(defaultBootclasspath(ctx), ":"))
ctx.Strict("PRODUCT_SYSTEM_SERVER_CLASSPATH", strings.Join(systemServerClasspath(ctx), ":"))
ctx.Strict("DEXPREOPT_BOOT_JARS_MODULES", strings.Join(defaultBootImageConfig(ctx).modules, ":"))
}