summaryrefslogtreecommitdiff
path: root/packages/CtsShim
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-24 00:45:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-24 00:45:44 +0000
commit36a95247849d63ade81b781bc339e2c50b3a35ee (patch)
tree1fa2c596992b82665e3b97b0582255cca4c65458 /packages/CtsShim
parentc788c8f24b4d0c6c9b63d985fac4bb735343bcce (diff)
parentceb0912409ea09b2c26940ee38a3f6dc177a286c (diff)
Merge "Remove dependencies on the 1-variant fallback" into main am: 3f1eba32bd am: ceb0912409
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3317794 Change-Id: I1eacd7c875f1cc696388b5f4e73e8b41e02808cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'packages/CtsShim')
-rw-r--r--packages/CtsShim/build/Android.bp4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 5b3d47e9f74d..bd892637a5eb 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -55,7 +55,7 @@ android_app {
],
}
-genrule {
+java_genrule {
name: "generate_priv_manifest",
srcs: [
"shim_priv/AndroidManifest.xml",
@@ -169,7 +169,7 @@ android_app {
min_sdk_version: "24",
}
-genrule {
+java_genrule {
name: "generate_shim_manifest",
srcs: [
"shim/AndroidManifest.xml",