Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7254f33 authored by Chris Wailes's avatar Chris Wailes Committed by Automerger Merge Worker
Browse files

Merge "Skip resetting the stack protector on eng builds" am: 838c317e am: bd0b4238 

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



Change-Id: I2e05b112f02c36bc2d57b5a247f07f907242846e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 047f6ddf bd0b4238

core/jni/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ cc_library_shared { 


    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

+1 −1
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ pid_t zygote::ForkCommon(JNIEnv* env, bool is_system_server, 
      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