From 4e445be558e5b41dd8ac279ed6d25c41a9f0cd7b Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Mon, 23 May 2022 04:00:23 +0000 Subject: [PATCH] Revert "Use D8 by default for android_test" This reverts commit 02edc1004757f6d6d5c2e2a93f1e8656ae2435cf. Reason for revert: Breaks test_suites_x86_64_coverage Bug: 233421462 Change-Id: I7b04d3fd7802be0f271ea3c29ef25e3d08ab1389 --- java/app.go | 3 +-- java/dex.go | 4 ++-- java/java_test.go | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/java/app.go b/java/app.go index 8c5933aa0..768d9e923 100755 --- a/java/app.go +++ b/java/app.go @@ -1017,7 +1017,7 @@ func (a *AndroidTest) OverridablePropertiesDepsMutator(ctx android.BottomUpMutat func AndroidTestFactory() android.Module { module := &AndroidTest{} - module.Module.dexProperties.Optimize.EnabledByDefault = false + module.Module.dexProperties.Optimize.EnabledByDefault = true module.Module.properties.Instrument = true module.Module.properties.Supports_static_instrumentation = true @@ -1071,7 +1071,6 @@ func (a *AndroidTestHelperApp) InstallInTestcases() bool { func AndroidTestHelperAppFactory() android.Module { module := &AndroidTestHelperApp{} - // TODO(b/192032291): Disable by default after auditing downstream usage. module.Module.dexProperties.Optimize.EnabledByDefault = true module.Module.properties.Installable = proptools.BoolPtr(true) diff --git a/java/dex.go b/java/dex.go index c943938e2..13d6e4a01 100644 --- a/java/dex.go +++ b/java/dex.go @@ -36,8 +36,8 @@ type DexProperties struct { Main_dex_rules []string `android:"path"` Optimize struct { - // If false, disable all optimization. Defaults to true for android_app and - // android_test_helper_app modules, false for android_test, java_library, and java_test modules. + // If false, disable all optimization. Defaults to true for android_app and android_test + // modules, false for java_library and java_test modules. Enabled *bool // True if the module containing this has it set by default. EnabledByDefault bool `blueprint:"mutated"` diff --git a/java/java_test.go b/java/java_test.go index 56a42483b..4c9382413 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -723,9 +723,9 @@ func TestDefaults(t *testing.T) { t.Errorf("atestNoOptimize should not optimize APK") } - atestDefault := ctx.ModuleForTests("atestDefault", "android_common").MaybeRule("d8") + atestDefault := ctx.ModuleForTests("atestDefault", "android_common").MaybeRule("r8") if atestDefault.Output == nil { - t.Errorf("atestDefault should not optimize APK") + t.Errorf("atestDefault should optimize APK") } }