commit 492df660f5edf7a0e0aea0e2d8c45bcf74cd8744
author Mahesh Sharma <smahesh@codeaurora.org> Wed May 15 10:06:00 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 17 17:07:07 2019 -0700
tree f1573f0b6ef24d3bc794a9eec30fd999d484822b
parent 16ee1f8e28b5dfa6ce73d8f83913e4bb0954df98

Revert "Disable CFI in bluetooth_ext"

This reverts commit ba5ef7b522f47f35b7a3662f150f946faae78f3c.

Change-Id: Ia254678e09a4bc7757872ab06dcf182ea98e0fc8

packages_apps_bluetooth_ext/jni/Android.bp

diff --git a/packages_apps_bluetooth_ext/jni/Android.bp b/packages_apps_bluetooth_ext/jni/Android.bp
index cb15b77..439f7a2 100644
--- a/packages_apps_bluetooth_ext/jni/Android.bp
+++ b/packages_apps_bluetooth_ext/jni/Android.bp
@@ -27,7 +27,4 @@
         "com_android_bluetooth_ba.cpp",
         "com_android_bluetooth_hf_vendor.cpp",
     ],
-    sanitize: {
-        never: true,
-    },
 }

system_bt_ext/bta/Android.bp

diff --git a/system_bt_ext/bta/Android.bp b/system_bt_ext/bta/Android.bp
index 749a040..1113dc1 100644
--- a/system_bt_ext/bta/Android.bp
+++ b/system_bt_ext/bta/Android.bp
@@ -40,7 +40,4 @@
         "libbt-utils",
     ],
     cflags: ["-DBUILDCFG"],
-    sanitize: {
-        never: true,
-    },
 }

system_bt_ext/btconfigstore/Android.bp

diff --git a/system_bt_ext/btconfigstore/Android.bp b/system_bt_ext/btconfigstore/Android.bp
index c1de2b1..2c82531 100644
--- a/system_bt_ext/btconfigstore/Android.bp
+++ b/system_bt_ext/btconfigstore/Android.bp
@@ -33,7 +33,4 @@
     required: [
         "bt_configstore.conf",
     ],
-    sanitize: {
-        never: true,
-    },
 }

system_bt_ext/btif/Android.bp

diff --git a/system_bt_ext/btif/Android.bp b/system_bt_ext/btif/Android.bp
index 7b41515..d2901ed 100644
--- a/system_bt_ext/btif/Android.bp
+++ b/system_bt_ext/btif/Android.bp
@@ -52,7 +52,5 @@
         "-DBUILDCFG",
         "-DHAS_NO_BDROID_BUILDCFG",
     ],
-    sanitize: {
-        never: true,
-    },
+
 }

system_bt_ext/device/Android.bp

diff --git a/system_bt_ext/device/Android.bp b/system_bt_ext/device/Android.bp
index b41b044..5fb1299 100644
--- a/system_bt_ext/device/Android.bp
+++ b/system_bt_ext/device/Android.bp
@@ -28,7 +28,4 @@
         "libosi_qti",
         "libbluetooth-types",
     ],
-    sanitize: {
-        never: true,
-    },
 }

system_bt_ext/osi/Android.bp

diff --git a/system_bt_ext/osi/Android.bp b/system_bt_ext/osi/Android.bp
index 9f7791e..505c7fd 100644
--- a/system_bt_ext/osi/Android.bp
+++ b/system_bt_ext/osi/Android.bp
@@ -24,7 +24,4 @@
         "libbt-utils",
     ],
     cflags: ["-DBUILDCFG"],
-    sanitize: {
-        never: true,
-    },
 }

system_bt_ext/stack/Android.bp

diff --git a/system_bt_ext/stack/Android.bp b/system_bt_ext/stack/Android.bp
index 46b1fa2..047b7d9 100644
--- a/system_bt_ext/stack/Android.bp
+++ b/system_bt_ext/stack/Android.bp
@@ -39,7 +39,4 @@
         "libcutils",
         "liblog",
     ],
-    sanitize: {
-        never: true,
-    },
 }