Move sh_vendor cflags to its own target

The cc_defaults.vendor doesn't work due to VNDK being disabled.
(b/69133815). So, the conversion to soon caused the sh_vendor to start
using $PATH from the environment (instead of the hardcoded one) that in
turn caused vendor shell scripts trying to run system toybox commands.

Bug: 68771183
Test: m -j sh_vendor; adb sync; adb shell; /vendor/bin/sh; echo $PATH
Test: Boot marlin with no denials from init_radio, init_power domains.
Change-Id: Ia90b74a4cffdeba9b53f3b8fb8a56c98386794fa
Signed-off-by: Sandeep Patil <sspatil@google.com>

diff --git a/Android.bp b/Android.bp
index 2ddb748..9926e18 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -116,20 +116,6 @@ cc_defaults {
         "-DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\"",
         "-DMKSH_DEFAULT_TMPDIR=\"/data/local\"",
     ],
-    target: {
-        vendor: {
-            cflags: [
-                // Additional flags for vendor variant
-                "-UMKSH_DEFAULT_PROFILEDIR",
-                "-UMKSHRC_PATH",
-                "-UMKSH_DEFAULT_EXECSHELL",
-                "-DMKSH_DEFAULT_PROFILEDIR=\"/vendor/etc\"",
-                "-DMKSHRC_PATH=\"/vendor/etc/mkshrc\"",
-                "-DMKSH_DEFAULT_EXECSHELL=\"/vendor/bin/sh\"",
-                "-DMKSH_DEFPATH_OVERRIDE=\"/vendor/bin:/vendor/xbin\"",
-            ],
-        },
-    },
 }
 
 cc_binary {
@@ -142,4 +128,14 @@ cc_binary {
     defaults: ["sh-defaults"],
     stem: "sh",
     vendor: true,
+    cflags: [
+        // Additional flags for vendor variant
+        "-UMKSH_DEFAULT_PROFILEDIR",
+        "-UMKSHRC_PATH",
+        "-UMKSH_DEFAULT_EXECSHELL",
+        "-DMKSH_DEFAULT_PROFILEDIR=\"/vendor/etc\"",
+        "-DMKSHRC_PATH=\"/vendor/etc/mkshrc\"",
+        "-DMKSH_DEFAULT_EXECSHELL=\"/vendor/bin/sh\"",
+        "-DMKSH_DEFPATH_OVERRIDE=\"/vendor/bin:/vendor/xbin\"",
+    ],
 }