Revert "Enable cfi for libhevc"

Revert submission 1515852-enable_cfi_hevc

Reason for revert: cts breakages
Reverted Changes:
I4d5ff6818:Enable cfi for libhevc
I181015a7d:Enable cfi in hevc library

Change-Id: Ieb8415ef29456a0df7be287a1edf07c7fb351a87

1 files changed, 4 insertions, 29 deletions

diff --git a/Android.bp b/Android.bp
index cc07f1e..c60d9e1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -368,23 +368,11 @@ cc_library_static {
         },
     },
 
-    target: {
-        android: {
-            sanitize: {
-                diag: {
-                    cfi: true,
-                },
-            },
-        },
-    },
-
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],
-        cfi: true,
-        config: {
-            cfi_assembly_support: true,
-        },
+        // Enable CFI if this becomes a shared library.
+        // cfi: true,
         blocklist: "libhevc_blocklist.txt",
     },
 
@@ -761,24 +749,11 @@ cc_library_static {
         },
 
     },
-
-    target: {
-        android: {
-            sanitize: {
-                diag: {
-                    cfi: true,
-                },
-            },
-        },
-    },
-
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],
-        cfi: true,
-        config: {
-            cfi_assembly_support: true,
-        },
+        // Enable CFI if this becomes a shared library.
+        // cfi: true,
         blocklist: "libhevc_blocklist.txt",
     },