diff options
| author | 2024-09-27 05:45:43 +0000 | |
|---|---|---|
| committer | 2024-09-27 05:45:43 +0000 | |
| commit | 22ad6c00c7b5ef51687bcde6fcfe4e7988a16d2c (patch) | |
| tree | c49c5b72fab70befea110ebfd7ce6205bcca1a8d /java/dexpreopt_bootjars.go | |
| parent | b6c7d7a3179bf01ee34445ad4575493ef55e16af (diff) | |
| parent | 953ce9e9256e9f7460b05729c8828c581df457ec (diff) | |
Merge "Remove some unused make vars" into main
Diffstat (limited to 'java/dexpreopt_bootjars.go')
| -rw-r--r-- | java/dexpreopt_bootjars.go | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 36886ae9c..d0cfe9d33 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -1372,18 +1372,7 @@ func (d *dexpreoptBootJars) MakeVars(ctx android.MakeVarsContext) { } image := d.defaultBootImage - if image != nil { - if profileInstallInfo, ok := android.OtherModuleProvider(ctx, d, profileInstallInfoProvider); ok { - ctx.Strict("DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED", profileInstallInfo.profileInstalls.String()) - if profileInstallInfo.profileLicenseMetadataFile.Valid() { - ctx.Strict("DEXPREOPT_IMAGE_PROFILE_LICENSE_METADATA", profileInstallInfo.profileLicenseMetadataFile.String()) - } - } - - if SkipDexpreoptBootJars(ctx) { - return - } - + if image != nil && !SkipDexpreoptBootJars(ctx) { global := dexpreopt.GetGlobalConfig(ctx) dexPaths, dexLocations := bcpForDexpreopt(ctx, global.PreoptWithUpdatableBcp) ctx.Strict("DEXPREOPT_BOOTCLASSPATH_DEX_FILES", strings.Join(dexPaths.Strings(), " ")) |