commit 224bb5760298c9ffe8a402441f7f99c029ee4690
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Feb 01 00:54:17 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 01 00:54:17 2018 +0000
tree 36462620d9b1c81dfe205d380d91df9c98e8c639
parent e0d3071ff4f06f551703dd8e4e4341e15d58bee0
parent e01949db294167ec9e42b2f3920b88b2709393bf

[automerger] Merge "Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into nyc-dr1-dev am: b5b90f0549" into nyc-mr1-dev am: 7adc0cb8e3 am: 5318b42c68 am: 97e7acf7a9 am: b191092dc9 am: ed4635ddc5 am: 73c8dd1f9f
am: e01949db29

Change-Id: I47449f5c7e57e32a286d3f66dd02ce0918a7fade

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