commit 39618eb5b724bd87d3845700e164cdf613062889
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Feb 01 00:51:53 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 01 00:51:53 2018 +0000
tree 36462620d9b1c81dfe205d380d91df9c98e8c639
parent 435804793f08af90ffd4002c0e6041111ebed007
parent bbb7fefdb4971f813637a64394a32bbc70631126

Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into oc-dev am: 3fffe3c300 am: 5759ea0b59 am: 57cd27cc9b
am: bbb7fefdb4

Change-Id: I7d4da74c75eae0c1e111b8778bea2ddb0390ab31

Android.bp

diff --git a/Android.bp b/Android.bp
index 957e253..4abfa16 100644
--- a/Android.bp
+++ b/Android.bp
@@ -231,6 +231,14 @@
             ],
         },
     },
+
+    sanitize: {
+    	cfi: true,
+        diag: {
+            cfi: true,
+        },
+        blacklist: "cfi_blacklist.txt",
+    },
 }
 
 cc_library_static {
@@ -492,6 +500,14 @@
             ],
         },
     },
+
+    sanitize: {
+    	cfi: true,
+        diag: {
+            cfi: true,
+        },
+        blacklist: "cfi_blacklist.txt",
+    },
 }
 
 subdirs = ["test"]

OWNERS

diff --git a/OWNERS b/OWNERS
index 3da5c7a..acffb3a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
 marcone@google.com
 essick@google.com
 lajos@google.com
+hkuang@google.com

cfi_blacklist.txt

diff --git a/cfi_blacklist.txt b/cfi_blacklist.txt
new file mode 100644
index 0000000..1571e0e
--- /dev/null
+++ b/cfi_blacklist.txt
@@ -0,0 +1 @@
+src:*external/libavc/*