commit 838c317e2d7828bf3251c99d909da844619a66d2
author Chris Wailes <chriswailes@google.com> Tue Jan 31 19:58:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 31 19:58:41 2023 +0000
tree 5ebff0aea00c094d59909625d198ca0400808c2e
parent aefe92f478b5a0226a97b3e40403cfea6388d313
parent ffd57d7a41bfdd29ec97f5474a9a77e4492287f1

Merge "Skip resetting the stack protector on eng builds"

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index f7d1014..b5b7c0f 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -40,6 +40,12 @@
 
     cppflags: ["-Wno-conversion-null"],
 
+    product_variables: {
+        eng: {
+            cflags: ["-DNO_RESET_STACK_PROTECTOR"],
+        },
+    },
+
     cpp_std: "gnu++20",
 
     srcs: [

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 19bcd7f..963a83e 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -2296,7 +2296,7 @@
       setpriority(PRIO_PROCESS, 0, PROCESS_PRIORITY_MIN);
     }
 
-#if defined(__BIONIC__)
+#if defined(__BIONIC__) && !defined(NO_RESET_STACK_PROTECTOR)
     // Reset the stack guard for the new process.
     android_reset_stack_guards();
 #endif