Merge master@5428150 into git_qt-dev-plus-aosp.

[android-x86/external-mksh.git] / Android.bp

diff --git a/Android.bp b/Android.bp
index 25d0882..b7edef2 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -32,7 +32,6 @@ cc_defaults {
         "-Wno-deprecated-declarations",
         "-fno-asynchronous-unwind-tables",
         "-fno-strict-aliasing",
-        "-fstack-protector",
         "-fwrapv",
 
         // ...various options we choose
@@ -108,7 +107,7 @@ cc_defaults {
         "-DHAVE_SYS_ERRLIST_DECL=0",
         "-DHAVE_SYS_SIGLIST_DECL=1",
         "-DHAVE_PERSISTENT_HISTORY=0",
-        "-DMKSH_BUILD_R=562",
+        "-DMKSH_BUILD_R=571",
 
         // Additional flags
         "-DMKSH_DEFAULT_PROFILEDIR=\"/system/etc\"",
@@ -116,22 +115,12 @@ cc_defaults {
         "-DMKSH_DEFAULT_EXECSHELL=\"/system/bin/sh\"",
         "-DMKSH_DEFAULT_TMPDIR=\"/data/local\"",
     ],
-    target: {
-        vendor: {
-            cflags: [
-                // Additional flags for vendor variant
-                "-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 {
     name: "sh",
     defaults: ["sh-defaults"],
+    recovery_available: true,
 }
 
 cc_binary {
@@ -139,4 +128,28 @@ 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\"",
+    ],
+}
+
+// /system/etc/mkshrc
+prebuilt_etc {
+    name: "mkshrc",
+    src: "mkshrc",
+}
+
+// /vendor/etc/mkshrc
+prebuilt_etc {
+    name: "mkshrc_vendor",
+    src: "mkshrc_vendor",
+    filename: "mkshrc",
+    soc_specific: true,
 }