Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9be4152c authored by Colin Cross's avatar Colin Cross
Browse files

Pass DEXPREOPT_BOOT_JARS_MODULES to Make 

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

Test: m checkbuild
Change-Id: Ie3db926df9c5d6bf18db1003b95823c7566800a9
parent 44df5814

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -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)

}

android/variable.go

+1 −2
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ type productVariables struct { 
	ModulesLoadedByPrivilegedModules []string `json:",omitempty"`



	BootJars []string `json:",omitempty"`

	PreoptBootJars []string `json:",omitempty"`



	IntegerOverflowExcludePaths []string `json:",omitempty"`

java/dexpreopt_config.go

+2 −0
Original line number Diff line number Diff line
@@ -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, ":"))

}