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

Pass DEXPREOPT_BOOT_JARS_MODULES to Make

Browse Source 
Make is not setting PreoptBootJars, pass the value computed in
Soong back to Make.

Test: m checkbuild
Change-Id: Ie3db926df9c5d6bf18db1003b95823c7566800a9
This commit is contained in:
Colin Cross
2019-02-20 10:40:13 -08:00
parent 44df581457
commit 9be4152c21
3 changed files with 3 additions and 6 deletions
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, ":"))
}