From 335c39e89f3663313f5f293e2379b2f2a2986527 Mon Sep 17 00:00:00 2001
From: Cindy Zhou <zhouci@google.com>
Date: Thu, 13 Feb 2020 13:20:53 -0800
Subject: [PATCH] Enable CFI in libjni_pacprocessor

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

Change-Id: I9b82cf6eeb2e880484cd2e51815a2b70a753a1a6
---
 packages/services/PacProcessor/jni/Android.bp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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