StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Use D8 by default for android_test"" am: 14b500daba am: 1e2e5fcb73

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100965

Change-Id: I263ec410fc4a118374989d16e0fadee30d9ddf63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-05-23 06:20:25 +00:00
committed by Automerger Merge Worker
parent 763da0fe98 1e2e5fcb73
commit d4899ce231
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/app.go
View File

@@ -1021,7 +1021,7 @@ func (a *AndroidTest) OverridablePropertiesDepsMutator(ctx android.BottomUpMutat
func AndroidTestFactory() android.Module { func AndroidTestFactory() android.Module {
module := &AndroidTest{} module := &AndroidTest{}
module.Module.dexProperties.Optimize.EnabledByDefault = false module.Module.dexProperties.Optimize.EnabledByDefault = true
module.Module.properties.Instrument = true module.Module.properties.Instrument = true
module.Module.properties.Supports_static_instrumentation = true module.Module.properties.Supports_static_instrumentation = true
@@ -1075,7 +1075,6 @@ func (a *AndroidTestHelperApp) InstallInTestcases() bool {
func AndroidTestHelperAppFactory() android.Module { func AndroidTestHelperAppFactory() android.Module {
module := &AndroidTestHelperApp{} module := &AndroidTestHelperApp{}
// TODO(b/192032291): Disable by default after auditing downstream usage.
module.Module.dexProperties.Optimize.EnabledByDefault = true module.Module.dexProperties.Optimize.EnabledByDefault = true
module.Module.properties.Installable = proptools.BoolPtr(true) module.Module.properties.Installable = proptools.BoolPtr(true)

4
java/dex.go
View File

@@ -36,8 +36,8 @@ type DexProperties struct {
Main_dex_rules []string `android:"path"` Main_dex_rules []string `android:"path"`
Optimize struct { Optimize struct {
// If false, disable all optimization. Defaults to true for android_app and // If false, disable all optimization. Defaults to true for android_app and android_test
// android_test_helper_app modules, false for android_test, java_library, and java_test modules. // modules, false for java_library and java_test modules.
Enabled *bool Enabled *bool
// True if the module containing this has it set by default. // True if the module containing this has it set by default.
EnabledByDefault bool `blueprint:"mutated"` EnabledByDefault bool `blueprint:"mutated"`

4
java/java_test.go
View File

@@ -723,9 +723,9 @@ func TestDefaults(t *testing.T) {
t.Errorf("atestNoOptimize should not optimize APK") 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 { if atestDefault.Output == nil {
t.Errorf("atestDefault should not optimize APK") t.Errorf("atestDefault should optimize APK")
} }
} }