Merge "Move sh_vendor cflags to its own target"android-o-mr1-iot-preview-6o-mr1-iot-preview-6

1 files changed, 10 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 2ddb748..9926e18 100644
--- 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\"",
+    ],
 }