commit 2e7b31f368be01437da025f2e12dc4dcbff46f5d
author Ben Cheng <bccheng@google.com> Wed Sep 09 15:47:09 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 15:47:09 2009 -0700
tree 386e09f8a14c114c1bc9fcb2107bf63db221f86c
parent ad8efa123b7133895b9c198a84a32020869eba18
parent 500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7

am 500464de: DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

Merge commit '500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7' into eclair-plus-aosp

* commit '500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7':
  DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.

vm/Dvm.mk

diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 66ada15..da34cad 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -195,13 +195,11 @@
 
 ifeq ($(WITH_JIT_TUNING),true)
   LOCAL_CFLAGS += -DWITH_JIT_TUNING
+  # NOTE: Turn on assertion for JIT for now
+  LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1 -DLOG_NDEBUG=1 -DWITH_DALVIK_ASSERT
 endif
 
 ifeq ($(WITH_JIT),true)
-  # NOTE: Turn on assertion for JIT for now
-  LOCAL_CFLAGS += -DWITH_DALVIK_ASSERT
-  # NOTE: Also turn on tuning when JIT is enabled for now
-  LOCAL_CFLAGS += -DWITH_JIT_TUNING
   LOCAL_CFLAGS += -DWITH_JIT
   LOCAL_SRC_FILES += \
 	../dexdump/OpCodeNames.c \