commit 6e31511811002ea471d28ea10fb3862034de1a89
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 24 23:54:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 24 23:54:26 2018 +0000
tree b788018a8cd8437929347d9b30e79d0684e02d31
parent 4ed6cb0fe6db0d4d67ba72f420739906774c75f0
parent 2cc4b4ad3fa63879a9ff49e61e947f45f290f252

Merge "Disable ASAN on statsd"

cmds/statsd/Android.mk

diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk
index 27c5a17..d3496ed 100644
--- a/cmds/statsd/Android.mk
+++ b/cmds/statsd/Android.mk
@@ -146,10 +146,10 @@
 LOCAL_MODULE_CLASS := EXECUTABLES
 
 # Enable sanitizer ONLY on eng builds.
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-    LOCAL_CLANG := true
-    LOCAL_SANITIZE := address
-endif
+#ifeq ($(TARGET_BUILD_VARIANT),eng)
+#    LOCAL_CLANG := true
+#    LOCAL_SANITIZE := address
+#endif
 
 # Add a flag to enable stats log printing from statsd on debug builds.
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))