Revert "Use D8 by default for android_test"

This reverts commit 02edc10047.

Reason for revert: Breaks test_suites_x86_64_coverage

Bug: 233421462
Change-Id: I7b04d3fd7802be0f271ea3c29ef25e3d08ab1389
This commit is contained in:
Jared Duke
2022-05-23 04:00:23 +00:00
parent 02edc10047
commit 4e445be558
3 changed files with 5 additions and 6 deletions

View File

@@ -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)