From b186af1bfb00e24ae7ca5c98483d151fd199f6be Mon Sep 17 00:00:00 2001
From: Anna Malova <amalova@google.com>
Date: Thu, 13 Feb 2020 11:52:32 +0000
Subject: [PATCH] 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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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