Merge "Revert "Disable pointer authentication in app processes."" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
3acea60275
@@ -64,8 +64,6 @@ cc_binary {
|
|||||||
"libwilhelm",
|
"libwilhelm",
|
||||||
],
|
],
|
||||||
|
|
||||||
header_libs: ["bionic_libc_platform_headers"],
|
|
||||||
|
|
||||||
compile_multilib: "both",
|
compile_multilib: "both",
|
||||||
|
|
||||||
cflags: [
|
cflags: [
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
#include <android-base/macros.h>
|
#include <android-base/macros.h>
|
||||||
#include <binder/IPCThreadState.h>
|
#include <binder/IPCThreadState.h>
|
||||||
#include <bionic/pac.h>
|
|
||||||
#include <hwbinder/IPCThreadState.h>
|
#include <hwbinder/IPCThreadState.h>
|
||||||
#include <utils/Log.h>
|
#include <utils/Log.h>
|
||||||
#include <cutils/memory.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());
|
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));
|
AppRuntime runtime(argv[0], computeArgBlockSize(argc, argv));
|
||||||
// Process command line arguments
|
// Process command line arguments
|
||||||
// ignore argv[0]
|
// ignore argv[0]
|
||||||
|
|||||||
Reference in New Issue
Block a user