Remove RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT
RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT is set to true in all
release configs in main, Soong can stop checking the value.
Bug: 383853591
Test: builds
Change-Id: I3f1879b2fcf265a39371767be939e57f41788bd7
diff --git a/java/aar.go b/java/aar.go
index f7c5c13..9779d7c 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -217,7 +217,7 @@
}
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 4f23f61..3d88604 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -1480,7 +1480,6 @@
"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 @@
"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 @@
},
{"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",
},
},