Merge changes from topics "target-build-unbundled", "unbundled-preopt"

* changes:
  Don't disable dexpreopting implicitly in unbundled builds.
  Add TARGET_BUILD_UNBUNDLED as a variable to control builds.
This commit is contained in:
Martin Stjernholm
2020-06-11 10:01:59 +00:00
committed by Gerrit Code Review
4 changed files with 4 additions and 13 deletions

View File

@@ -179,15 +179,7 @@ func RegisterDexpreoptBootJarsComponents(ctx android.RegistrationContext) {
}
func skipDexpreoptBootJars(ctx android.PathContext) bool {
if dexpreopt.GetGlobalConfig(ctx).DisablePreopt {
return true
}
if ctx.Config().UnbundledBuild() {
return true
}
return false
return dexpreopt.GetGlobalConfig(ctx).DisablePreopt
}
type dexpreoptBootJars struct {