aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgenii Stepanov <eugenis@google.com>2016-12-16 21:59:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-16 21:59:46 +0000
commitfbe33dc85ac74d19ee15367588bcf7f79fd9c666 (patch)
tree8e95246b0b5478a5fb5bf65dac63029a78d6c267
parentc46e505dc360ca477aa915651babf4f2e2259f16 (diff)
parentccb41b2cf94d4049785588591962d90d68e676b3 (diff)
downloadlibpng-fbe33dc85ac74d19ee15367588bcf7f79fd9c666.tar.gz
Merge "Remove sanitize:never" am: ad4a6db68e am: 29a3a9a086 am: b6c44fb27f
am: ccb41b2cf9 Change-Id: Id061bc049b551e5ca76d2a609492f7d4ea2bd428
-rw-r--r--Android.bp8
1 files changed, 0 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 7dcf4a738..65bb9ba7e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -85,11 +85,6 @@ cc_library {
windows: {
enabled: true,
},
- android: {
- sanitize: {
- never: true,
- },
- },
},
}
@@ -101,9 +96,6 @@ cc_library_static {
defaults: ["libpng-defaults"],
cflags: ["-ftrapv"],
- sanitize: {
- never: true,
- },
shared_libs: ["libz"],
sdk_version: "14",
}