summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ivan Lozano <ivanlozano@google.com> 2017-12-28 18:43:41 +0000
committer android-build-merger <android-build-merger@google.com> 2017-12-28 18:43:41 +0000
commit203055b3228f36b9f0587eba79ecd6630f31915d (patch)
treef708b7c83846ab646492536dcdfef452218b2c2e
parenta205f421729ee68840acbdcd8577cd19cafba48f (diff)
parentf7c56624c732c2e0f50096410b80d65163307703 (diff)
Merge "Disable sanitizer entirely in ResourceTypes.cpp"
am: f7c56624c7 Change-Id: I1843878f7194696896700572f2259f5f2c6b92c2
-rw-r--r--libs/androidfw/Android.bp3
-rw-r--r--libs/androidfw/libandroidfw_blacklist.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp
index c4c14c9e32d4..1d14fa0d55f7 100644
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -89,4 +89,7 @@ cc_library {
// initialization with {}.
},
},
+ sanitize: {
+ blacklist: "libandroidfw_blacklist.txt",
+ },
}
diff --git a/libs/androidfw/libandroidfw_blacklist.txt b/libs/androidfw/libandroidfw_blacklist.txt
new file mode 100644
index 000000000000..dd17e4d5b1e8
--- /dev/null
+++ b/libs/androidfw/libandroidfw_blacklist.txt
@@ -0,0 +1 @@
+src:*/ResourceTypes.cpp