diff options
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | java/aar.go | 2 | ||||
| -rw-r--r-- | java/app_test.go | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/android/config.go b/android/config.go index 3867c1197..f924e0860 100644 --- a/android/config.go +++ b/android/config.go @@ -2176,10 +2176,6 @@ func (c *config) UseOptimizedResourceShrinkingByDefault() bool { return c.productVariables.GetBuildFlagBool("RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT") } -func (c *config) UseResourceProcessorByDefault() bool { - return c.productVariables.GetBuildFlagBool("RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT") -} - func (c *config) UseTransitiveJarsInClasspath() bool { return c.productVariables.GetBuildFlagBool("RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH") } diff --git a/java/aar.go b/java/aar.go index f7c5c13de..9779d7cc3 100644 --- a/java/aar.go +++ b/java/aar.go @@ -217,7 +217,7 @@ func (p propagateRROEnforcementTransitionMutator) Mutate(ctx android.BottomUpMut } func (a *aapt) useResourceProcessorBusyBox(ctx android.BaseModuleContext) bool { - return BoolDefault(a.aaptProperties.Use_resource_processor, ctx.Config().UseResourceProcessorByDefault()) && + return BoolDefault(a.aaptProperties.Use_resource_processor, true) && // TODO(b/331641946): remove this when ResourceProcessorBusyBox supports generating shared libraries. !slices.Contains(a.aaptProperties.Aaptflags, "--shared-lib") && // Use the legacy resource processor in kythe builds. diff --git a/java/app_test.go b/java/app_test.go index 4f23f61a4..3d88604ab 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -1480,7 +1480,6 @@ func TestAndroidResourceOverlays(t *testing.T) { "device/vendor/blah/overlay/bar/res/values/strings.xml", }, {"lib", "android_common"}: { - "out/soong/.intermediates/lib2/android_common/package-res.apk", "lib/res/res/values/strings.xml", "device/vendor/blah/overlay/lib/res/values/strings.xml", }, @@ -1515,12 +1514,10 @@ func TestAndroidResourceOverlays(t *testing.T) { "device/vendor/blah/overlay/bar/res/values/strings.xml", }, {"lib", "android_common"}: { - "out/soong/.intermediates/lib2/android_common/package-res.apk", "lib/res/res/values/strings.xml", "device/vendor/blah/overlay/lib/res/values/strings.xml", }, {"lib", "android_common_rro"}: { - "out/soong/.intermediates/lib2/android_common_rro/package-res.apk", "lib/res/res/values/strings.xml", }, }, @@ -1560,7 +1557,6 @@ func TestAndroidResourceOverlays(t *testing.T) { }, {"bar", "android_common"}: {"device/vendor/blah/static_overlay/bar/res/values/strings.xml"}, {"lib", "android_common"}: { - "out/soong/.intermediates/lib2/android_common/package-res.apk", "lib/res/res/values/strings.xml", }, }, |