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

Commit 95dc32f4 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Revert "Disable pointer authentication in app processes."" am: b9fc2910 am: a236c375 

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

Change-Id: I93b82b72e47d779015822f35d9495e8d9be6567d
parents 92d4ec9c a236c375

cmds/app_process/Android.bp

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

    ],



    header_libs: ["bionic_libc_platform_headers"],



    compile_multilib: "both",



    cflags: [

cmds/app_process/app_main.cpp

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


#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>
@@ -183,10 +182,6 @@ 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]