diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-04-16 17:16:58 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-22 10:46:51 -0700 |
| commit | 4eaeab4442a9b760ed9f07ca5b40088cb602def9 (patch) | |
| tree | 7df1d90e6bdeefbcf2fd7c7f919f4cd81e7b7bc8 /java/app.go | |
| parent | 5c87791a78fc31620b165300c7976d8cf5674f9c (diff) | |
| download | android_build_soong-4eaeab4442a9b760ed9f07ca5b40088cb602def9.tar.gz android_build_soong-4eaeab4442a9b760ed9f07ca5b40088cb602def9.tar.bz2 android_build_soong-4eaeab4442a9b760ed9f07ca5b40088cb602def9.zip | |
Fix handling optimize.enabled from java_defaults
Some module types (`android_test`, etc.) set `optimize.enabled` by
default. If such module happens to have `defaults` attribute which
clears `optimize.enabled`, the latter value is ignored.
Fixes: 129858282
Test: unit tests in java_test.go,
`atest CtsExtendedMockingTestCases` succeeds with aog/936802
reverted (that is, with cts/test/mocking converted to Android.bp)
Change-Id: Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c
Merged-In: Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c
(cherry picked from commit 2057f82161dec05cb23535da713ec0fae44c38d1)
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/app.go b/java/app.go index ab623e24..da8024fd 100644 --- a/java/app.go +++ b/java/app.go @@ -438,7 +438,7 @@ func (a *AndroidApp) getCertString(ctx android.BaseContext) string { func AndroidAppFactory() android.Module { module := &AndroidApp{} - module.Module.deviceProperties.Optimize.Enabled = proptools.BoolPtr(true) + module.Module.deviceProperties.Optimize.EnabledByDefault = true module.Module.deviceProperties.Optimize.Shrink = proptools.BoolPtr(true) module.Module.properties.Instrument = true @@ -508,7 +508,7 @@ func (a *AndroidTest) DepsMutator(ctx android.BottomUpMutatorContext) { func AndroidTestFactory() android.Module { module := &AndroidTest{} - module.Module.deviceProperties.Optimize.Enabled = proptools.BoolPtr(true) + module.Module.deviceProperties.Optimize.EnabledByDefault = true module.Module.properties.Instrument = true module.Module.properties.Installable = proptools.BoolPtr(true) @@ -550,7 +550,7 @@ type AndroidTestHelperApp struct { func AndroidTestHelperAppFactory() android.Module { module := &AndroidTestHelperApp{} - module.Module.deviceProperties.Optimize.Enabled = proptools.BoolPtr(true) + module.Module.deviceProperties.Optimize.EnabledByDefault = true module.Module.properties.Installable = proptools.BoolPtr(true) module.appProperties.Use_embedded_native_libs = proptools.BoolPtr(true) |