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

Commit 192923ab authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

Merge "Disable pointer authentication in app processes." am: 4b799b36 am:... 

Merge "Disable pointer authentication in app processes." am: 4b799b36 am: 373ab4c0 am: 1d5943f8 am: 346030ce

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

Change-Id: I6283a782aadd8db730cc30043c68a7e48036d87d
parents 5373a2e6 346030ce

cmds/app_process/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ cc_binary { 
        "libwilhelm",

    ],



    header_libs: ["bionic_libc_platform_headers"],



    compile_multilib: "both",



    cflags: [

cmds/app_process/app_main.cpp

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <android-base/macros.h>

#include <binder/IPCThreadState.h>

#include <bionic/pac.h>

#include <hwbinder/IPCThreadState.h>

#include <utils/Log.h>

#include <cutils/memory.h>
@@ -182,6 +183,10 @@ int main(int argc, char* const argv[]) 
      ALOGV("app_process main with argv: %s", argv_String.string());

    }



    // Because of applications that are using PAC instructions incorrectly, PAC

    // is disabled in application processes for now.

    ScopedDisablePAC x;



    AppRuntime runtime(argv[0], computeArgBlockSize(argc, argv));

    // Process command line arguments

    // ignore argv[0]