Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44338663 authored by Jared Duke's avatar Jared Duke Committed by Gerrit Code Review
Browse files

Merge "Revert "Revert "Use D8 by default for android_test"""

parents 62ac8a07 63a3da94

java/app.go

+2 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ func (a *AndroidTest) OverridablePropertiesDepsMutator(ctx android.BottomUpMutat 
func AndroidTestFactory() android.Module {

	module := &AndroidTest{}



	module.Module.dexProperties.Optimize.EnabledByDefault = true

	module.Module.dexProperties.Optimize.EnabledByDefault = false



	module.Module.properties.Instrument = true

	module.Module.properties.Supports_static_instrumentation = true
@@ -1066,6 +1066,7 @@ 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)

java/dex.go

+2 −2
Original line number Diff line number Diff line
@@ -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

		// modules, false for java_library and java_test modules.

		// 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.

		Enabled *bool

		// True if the module containing this has it set by default.

		EnabledByDefault bool `blueprint:"mutated"`

java/java_test.go

+2 −2
Original line number Diff line number Diff line
@@ -723,9 +723,9 @@ func TestDefaults(t *testing.T) { 
		t.Errorf("atestNoOptimize should not optimize APK")

	}



	atestDefault := ctx.ModuleForTests("atestDefault", "android_common").MaybeRule("r8")

	atestDefault := ctx.ModuleForTests("atestDefault", "android_common").MaybeRule("d8")

	if atestDefault.Output == nil {

		t.Errorf("atestDefault should optimize APK")

		t.Errorf("atestDefault should not optimize APK")

	}

}