commit 14527cc0ad37098c1f6201ca8a8c6a964cf70553
author Nicolas Geoffray <ngeoffray@google.com> Mon Jun 13 15:14:53 2016 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Jun 13 15:14:53 2016 +0100
tree 366c84d9589e143880f1a11bb325e3ad47de18b2
parent 834f4445e70543bfdbcdd6435ccceb7a6dd82c4d

Pass the right CFLAGS to libarttest(d).

bug:28406866
Change-Id: If063bfda90786f58e2dba68fe1b96a668e7db177

test/Android.libarttest.mk

diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk
index feee7c2..8598474 100644
--- a/test/Android.libarttest.mk
+++ b/test/Android.libarttest.mk
@@ -87,7 +87,11 @@
   LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.libarttest.mk
   ifeq ($$(art_target_or_host),target)
     $(call set-target-local-clang-vars)
-    $(call set-target-local-cflags-vars,debug)
+    ifeq ($$(suffix),d)
+      $(call set-target-local-cflags-vars,debug)
+    else
+      $(call set-target-local-cflags-vars,ndebug)
+    endif
     LOCAL_SHARED_LIBRARIES += libdl
     LOCAL_MULTILIB := both
     LOCAL_MODULE_PATH_32 := $(ART_TARGET_TEST_OUT)/$(ART_TARGET_ARCH_32)