From e1e57730263cf28e40faeba0d96229e71c9c2190 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 16 Mar 2022 02:35:10 +0000 Subject: Revert "Disable pointer authentication in app processes." Revert "Disable pointer authentication in app processes." Revert "[automerged blank] Disable pointer authentication in app..." Revert submission 16712509-sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev Reason for revert: PAC has shipped with S, and we're going with app compat outreach rather than regressing security. Reverted Changes: I3030c47be:Disable pointer authentication in app processes. I3030c47be:Disable pointer authentication in app processes. I84a696428:[automerged blank] Disable pointer authentication ... Ibc52deaf3:[automerged blank] Disable pointer authentication ... Change-Id: I7ebdfce99ef6387415eb21cd216344b8eaf64b61 --- cmds/app_process/Android.bp | 2 -- cmds/app_process/app_main.cpp | 5 ----- 2 files changed, 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 #include -#include #include #include #include @@ -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] -- cgit v1.2.3-59-g8ed1b