Merge "Improve optimize bp2build conditional." into main
diff --git a/java/app.go b/java/app.go
index 10ffa7a..ed1c107 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1689,16 +1689,12 @@
//
// TODO(b/192032291): Disable android_test_helper_app optimization by
// default after auditing downstream usage.
- if a.dexProperties.Optimize.Enabled == nil {
- // Property was not explicitly defined.
- a.dexProperties.Optimize.Enabled = &a.dexProperties.Optimize.EnabledByDefault
+ if a.dexProperties.Optimize.EnabledByDefault != a.dexer.effectiveOptimizeEnabled() {
+ // Property is explicitly defined by default from default, so emit the Bazel attribute.
+ appAttrs.Optimize = proptools.BoolPtr(a.dexer.effectiveOptimizeEnabled())
}
- if Bool(a.dexProperties.Optimize.Enabled) {
- if !a.dexProperties.Optimize.EnabledByDefault {
- // explicitly enable optimize for module types that disable it by default
- appAttrs.Optimize = proptools.BoolPtr(true)
- }
+ if a.dexer.effectiveOptimizeEnabled() {
handCraftedFlags := ""
if Bool(a.dexProperties.Optimize.Ignore_warnings) {
handCraftedFlags += "-ignorewarning "
@@ -1728,9 +1724,6 @@
})
appAttrs.Proguard_specs.Add(bazel.MakeLabelAttribute(":" + generatedFlagFileRuleName))
}
- } else if a.dexProperties.Optimize.EnabledByDefault {
- // explicitly disable optimize for module types that enable it by default
- appAttrs.Optimize = proptools.BoolPtr(false)
}
commonAttrs, bp2BuildInfo, supported := a.convertLibraryAttrsBp2Build(ctx)