commit f2d85a18f29f3a1ea161c9880413277f6ec39709
author Colin Cross <ccross@android.com> Tue Mar 05 13:32:44 2024 -0800
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Mar 06 00:39:05 2024 +0000
tree f582d7869370a327a7dbfe68ee88c9c42ff9132c
parent b6395777ec63e1dd5e83abe1bbbb6dfde4bfb46b

Remove resources from SystemUI-tests

The test resources are provided by SystemUI-tests-base, but
SystemUI-tests was implicitly picking up the main SystemUI tests
while using the com.android.systemui.tests Android package.  This
should have shadowed the R classes from SystemUI-tests-base, but the
classpath order of the R classes was backwards.  Remove the implicit
resources from SystemUI-tests to allow swapping the R classpath
order.

Bug: 294256649
Test: m SystemUITests
Flag: NONE
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:164493bedcda94ed34ceae5078517160e0a34129)
Merged-In: I41ede1c2899994986dc6e265466626f67a2aec46
Change-Id: I41ede1c2899994986dc6e265466626f67a2aec46

packages/SystemUI/Android.bp

diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index de0fe14..2929785 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -341,6 +341,7 @@
         "SystemUI_compose_defaults",
     ],
     manifest: "tests/AndroidManifest-base.xml",
+    resource_dirs: [],
     additional_manifests: ["tests/AndroidManifest.xml"],
     srcs: [
         "tests/src/**/*.kt",