diff options
| author | 2022-03-14 21:09:31 +0000 | |
|---|---|---|
| committer | 2022-03-14 21:09:31 +0000 | |
| commit | b9fc2910cad1b07edcd0b1eef6aeebe89eb5e3e0 (patch) | |
| tree | bfdb643d652a4ac7f8d937bdbb4535be0b91fca8 | |
| parent | e6c05a8fd7203a56bb584ff86aa207061b064e0f (diff) | |
| parent | 90d4d6040c23359ff8bf00358e4a8bd694fcf591 (diff) | |
Merge "Revert "Disable pointer authentication in app processes.""
| -rw-r--r-- | cmds/app_process/Android.bp | 2 | ||||
| -rw-r--r-- | cmds/app_process/app_main.cpp | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/cmds/app_process/Android.bp b/cmds/app_process/Android.bp index 6a685a79cc33..a1575173ded6 100644 --- a/cmds/app_process/Android.bp +++ b/cmds/app_process/Android.bp @@ -64,8 +64,6 @@ cc_binary { "libwilhelm", ], - header_libs: ["bionic_libc_platform_headers"], - compile_multilib: "both", cflags: [ diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index 815f9455471c..12083b6fe20b 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -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] |