commit 297bb89927e3e7d6a2b9afae5c2ef804bb27f39c
author Yao Chen <yaochen@google.com> Wed Mar 21 22:09:45 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 21 22:09:45 2018 +0000
tree c73daf3ae8292cd53b3012e60865beb63dace1ef
parent ce42eb00bb0dbe9b329e9d5e117bdccfe97e136d
parent a40fe4946a43a76e853be4525048a96ce07ac4a3

Merge "Enable sanitizer on statsd eng build." into pi-dev am: dc5677336c
am: a40fe4946a

Change-Id: Ic898bbb4d8129097192ca75600682e937cba5f33

cmds/statsd/Android.mk

diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk
index ca0611b..525ddb3 100644
--- a/cmds/statsd/Android.mk
+++ b/cmds/statsd/Android.mk
@@ -135,6 +135,12 @@
 
 LOCAL_MODULE_CLASS := EXECUTABLES
 
+# Enable sanitizer on eng builds
+ifeq ($(TARGET_BUILD_VARIANT),eng)
+    LOCAL_CLANG := true
+    LOCAL_SANITIZE := address unsigned-integer-overflow signed-integer-overflow
+endif
+
 LOCAL_INIT_RC := statsd.rc
 
 include $(BUILD_EXECUTABLE)