[automerger] Merge "Merge "Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into cw-e-dev am: 7ddccbc4ee" into mnc-dr1.5-dev am: 42a053fe83" into nyc-dev am: 361390bbc6 am: ee555d921e am: 5b1296201b am: a2a9a8d8ec am: c3c07aa307 am: e34b0c7b50 am: d1fafa9170 am: bff6aaa508
am: 4747f418bf
Change-Id: Iaae3c3fbf2a17c690ad1f1cee0da17bce11646ea
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"]
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
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/*
