Merge changes from topic "am-c9e7b840dd89496cad321d7c52b28826" into nyc-mr2-dev am: 6052f446a4 am: 82a4181619 am: 0165216b58 am: 43a7b0a4df
am: 496e24f7b8
Change-Id: I7cfc4ad8892760286fcb67a4164bf7d7b6079940
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/*