commit b10db488c10867c80e2811a9c096602a562accae
author David Anderson <dvander@google.com> Mon Jun 13 18:30:17 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 13 18:30:17 2022 +0000
tree 1a74b712c2883ed1fa6d1617f1e93fa837e2d8b7
parent 0d9240f89816dfe970d8ecb1b871ca138e94b927
parent 4aaff2b264bccfab24bcacde14030495a7111ef7

Merge "sh_binary_host for 'adb-remount-test.sh'." am: 4aaff2b264

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2116135

Change-Id: I331d01d7cb2526357e7e695b5014dd6f5efa6b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/tests/Android.bp

diff --git a/fs_mgr/tests/Android.bp b/fs_mgr/tests/Android.bp
index d82d566..fdc0d8e 100644
--- a/fs_mgr/tests/Android.bp
+++ b/fs_mgr/tests/Android.bp
@@ -52,9 +52,9 @@
     ],
 }
 
-cc_prebuilt_binary {
+sh_binary_host {
     name: "adb-remount-test.sh",
-    srcs: ["adb-remount-test.sh"],
+    src: "adb-remount-test.sh",
     target: {
         darwin: {
             enabled: false,
@@ -62,11 +62,7 @@
         windows: {
             enabled: false,
         },
-        android: {
-            enabled: false,
-        },
     },
-    host_supported: true,
 }
 
 sh_test {