commit 79a07fe1bcf5539d1db8d5b95092990e3b20976e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Feb 01 00:54:43 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 01 00:54:43 2018 +0000
tree 36462620d9b1c81dfe205d380d91df9c98e8c639
parent e17e1ab2a05b7797cd2546e74acc8a4b5b142034
parent 6050e6adb590f7d44f797f230be1563026ff43c9

[automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into cw-e-dev am: 16e1cbc2d9 am: a0f9fb4a8d am: 8c2d760c29 am: eb42814612 am: e7eb563d5d am: 25be26f234 am: 3444f21010 am: eb492b0cec am: fa6f78c9be am: 696f20c064
am: 6050e6adb5

Change-Id: I04f7c9c9a9ce564e4a755180bd1dbb05b1b082dd

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/*