Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip resetting the stack protector on eng builds" am: 838c317e2d am: bd0b423890

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407872

Change-Id: I2e05b112f02c36bc2d57b5a247f07f907242846e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Wailes
2023-01-31 21:23:36 +00:00
committed by Automerger Merge Worker
parent 047f6ddf4a bd0b423890
commit c7254f3319
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/Android.bp
View File

@@ -40,6 +40,12 @@ cc_library_shared {
cppflags: ["-Wno-conversion-null"], cppflags: ["-Wno-conversion-null"],
product_variables: {
eng: {
cflags: ["-DNO_RESET_STACK_PROTECTOR"],
},
},
cpp_std: "gnu++20", cpp_std: "gnu++20",
srcs: [ srcs: [

2
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -2302,7 +2302,7 @@ pid_t zygote::ForkCommon(JNIEnv* env, bool is_system_server,
setpriority(PRIO_PROCESS, 0, PROCESS_PRIORITY_MIN); 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. // Reset the stack guard for the new process.
android_reset_stack_guards(); android_reset_stack_guards();
#endif #endif