|
@@ -500,9 +500,6 @@ func (d *dexpreoptBootJars) GenerateAndroidBuildActions(ctx android.ModuleContex
|
|
|
|
|
|
// Generate build rules for boot images.
|
|
|
func (d *dexpreoptBootJars) GenerateSingletonBuildActions(ctx android.SingletonContext) {
|
|
|
- if SkipDexpreoptBootJars(ctx) {
|
|
|
- return
|
|
|
- }
|
|
|
if dexpreopt.GetCachedGlobalSoongConfig(ctx) == nil {
|
|
|
// No module has enabled dexpreopting, so we assume there will be no boot image to make.
|
|
|
return
|
|
@@ -1002,7 +999,7 @@ func writeGlobalConfigForMake(ctx android.SingletonContext, path android.Writabl
|
|
|
// (make/core/dex_preopt_libart.mk) to generate install rules that copy boot image files to the
|
|
|
// correct output directories.
|
|
|
func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) {
|
|
|
- if d.dexpreoptConfigForMake != nil {
|
|
|
+ if d.dexpreoptConfigForMake != nil && !SkipDexpreoptBootJars(ctx) {
|
|
|
ctx.Strict("DEX_PREOPT_CONFIG_FOR_MAKE", d.dexpreoptConfigForMake.String())
|
|
|
ctx.Strict("DEX_PREOPT_SOONG_CONFIG_FOR_MAKE", android.PathForOutput(ctx, "dexpreopt_soong.config").String())
|
|
|
}
|
|
@@ -1014,6 +1011,10 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) {
|
|
|
ctx.Strict("DEXPREOPT_IMAGE_PROFILE_LICENSE_METADATA", image.profileLicenseMetadataFile.String())
|
|
|
}
|
|
|
|
|
|
+ if SkipDexpreoptBootJars(ctx) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
global := dexpreopt.GetGlobalConfig(ctx)
|
|
|
dexPaths, dexLocations := bcpForDexpreopt(ctx, global.PreoptWithUpdatableBcp)
|
|
|
ctx.Strict("DEXPREOPT_BOOTCLASSPATH_DEX_FILES", strings.Join(dexPaths.Strings(), " "))
|