summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2016-04-19 17:51:08 -0500
committerandroid-build-merger2016-04-19 17:51:08 -0500
commitc4dcc38e44a28d91922def85b1ff95802cdf50f7 (patch)
tree3d81dcbe1be595f3de8ecc70c377c54f442a5fbd /liblog/Android.bp
parent9428814b8e57e0562235776927c0d3ed99f73f2c (diff)
parent9ba3f6db392f0f9b25cc5b3ad03c984fdc76094f (diff)
downloadplatform-system-core-c4dcc38e44a28d91922def85b1ff95802cdf50f7.tar.gz
platform-system-core-c4dcc38e44a28d91922def85b1ff95802cdf50f7.tar.xz
platform-system-core-c4dcc38e44a28d91922def85b1ff95802cdf50f7.zip
Merge "Update sanitize property format" am: 0652728
am: 9ba3f6d * commit '9ba3f6db392f0f9b25cc5b3ad03c984fdc76094f': Update sanitize property format Change-Id: I7ac818440c50c7166921d74dfb3b6c10af19ee09
Diffstat (limited to 'liblog/Android.bp')
-rw-r--r--liblog/Android.bp4
1 files changed, 3 insertions, 1 deletions
diff --git a/liblog/Android.bp b/liblog/Android.bp
index 9c68fcae1..1051016fe 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -56,7 +56,9 @@ cc_library {
56 android: { 56 android: {
57 srcs: liblog_target_sources, 57 srcs: liblog_target_sources,
58 // AddressSanitizer runtime library depends on liblog. 58 // AddressSanitizer runtime library depends on liblog.
59 sanitize: ["never"], 59 sanitize: {
60 never: true,
61 },
60 }, 62 },
61 android_arm: { 63 android_arm: {
62 // TODO: This is to work around b/24465209. Remove after root cause is fixed 64 // TODO: This is to work around b/24465209. Remove after root cause is fixed