commit b186af1bfb00e24ae7ca5c98483d151fd199f6be
author Anna Malova <amalova@google.com> Thu Feb 13 11:52:32 2020 +0000
committer Anna Malova <amalova@google.com> Thu Feb 13 12:20:31 2020 +0000
tree 40b074bcb05cd5dccf61dbf59069e230213367f4
parent c228e1d88a71b2d44f3721fb68a18b61ea7acfc2

Disable CFI in libpac.

Bug: 147359729
Bug: 145990493
Test: Run proxy CTS tests on cuttlefish
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest

Change-Id: I5b1bb53b3acb2b5587657ce266070ca7c09f2f9d

packages/services/PacProcessor/jni/Android.bp

diff --git a/packages/services/PacProcessor/jni/Android.bp b/packages/services/PacProcessor/jni/Android.bp
index ab21a76..351e92c 100644
--- a/packages/services/PacProcessor/jni/Android.bp
+++ b/packages/services/PacProcessor/jni/Android.bp
@@ -37,7 +37,8 @@
         "-Wunused",
         "-Wunreachable-code",
     ],
-    sanitize: {
-        cfi: true,
-    },
+    // Re-enable when b/145990493 is fixed
+    // sanitize: {
+    //    cfi: true,
+    // },
 }