summaryrefslogtreecommitdiff
path: root/java/app_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-20 15:45:46 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-20 15:45:46 -0800
commit94ca16f5bd8c09c8383f60171ae93b3f2a41f137 (patch)
tree76ad64410e71bfb2c1e3e5f30832b606cd556c08 /java/app_test.go
parent241562be11a028313127b9325d87a2243db984b9 (diff)
parent7fc27f3b7737007793f6b065fb8a1d526318a708 (diff)
Merge "Remove RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT" into main am: 8f8e31c86a am: 7fc27f3b77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3502195 Change-Id: I6932eb7b1b0668340ed8b4b578b222791f1c6284 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/app_test.go')
-rw-r--r--java/app_test.go4
1 files changed, 0 insertions, 4 deletions
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",
},
},