Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: Ieae60b363dc21a93e6a9434cc0e2dc9a9a0e8252

diff --git a/Android.bp b/Android.bp
index 2bca561..cb2d43c 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
@@ -121,6 +120,7 @@ cc_defaults {
 cc_binary {
     name: "sh",
     defaults: ["sh-defaults"],
+    recovery_available: true,
 }
 
 cc_binary {

diff --git a/mkshrc b/mkshrc
index 778cf09..d37de12 100644 (file)
--- a/mkshrc
+++ b/mkshrc
@@ -6,6 +6,8 @@
 #
 # Support: https://launchpad.net/mksh
 
+set +o nohup
+
 if (( USER_ID )); then PS1='$'; else PS1='#'; fi
 PS4='[$EPOCHREALTIME] '; PS1='${|
        local e=$?

diff --git a/mkshrc_vendor b/mkshrc_vendor
index 778cf09..d37de12 100644 (file)
--- a/mkshrc_vendor
+++ b/mkshrc_vendor
@@ -6,6 +6,8 @@
 #
 # Support: https://launchpad.net/mksh
 
+set +o nohup
+
 if (( USER_ID )); then PS1='$'; else PS1='#'; fi
 PS4='[$EPOCHREALTIME] '; PS1='${|
        local e=$?