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

Commit 838c317e authored by Chris Wailes's avatar Chris Wailes Committed by Gerrit Code Review
Browse files

Merge "Skip resetting the stack protector on eng builds"

parents aefe92f4 ffd57d7a

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
@@ -2296,7 +2296,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