From 9be4152c2191b2bd489498252f6b61ac5b95e68b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 20 Feb 2019 10:40:13 -0800 Subject: [PATCH] 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 --- android/config.go | 4 ---- android/variable.go | 3 +-- java/dexpreopt_config.go | 2 ++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/android/config.go b/android/config.go index cfa2c0f76..24be10a96 100644 --- a/android/config.go +++ b/android/config.go @@ -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) } diff --git a/android/variable.go b/android/variable.go index 700d9174c..5ee888f06 100644 --- a/android/variable.go +++ b/android/variable.go @@ -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"` diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 6af839baf..3d4042b04 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -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, ":")) }