commit ebed06a259eb1c00112a4e3a9d6d721700bbaedb
author Mike Reed <reed@google.com> Fri Nov 06 11:24:37 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 06 11:24:37 2009 -0800
tree c6e64a3b72b154577c2d65e772421b7498080093
parent 6f007cf96c21b1dfce6e258eee5c2963aa86bcf1
parent 65a731b737bd6e8afa0b18176064dcc130dbb4ce

am 65a731b7: Merge change I8dd26ee4 into eclair-mr2

Merge commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp

* commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce':
  remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)

core/combo/linux-arm.mk

diff --git a/core/combo/linux-arm.mk b/core/combo/linux-arm.mk
index 6011351..6529106 100644
--- a/core/combo/linux-arm.mk
+++ b/core/combo/linux-arm.mk
@@ -112,7 +112,7 @@
 $(combo_target)GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden
 
 $(combo_target)RELEASE_CFLAGS := \
-			-DSK_RELEASE -DNDEBUG \
+			-DNDEBUG \
 			-g \
 			-Wstrict-aliasing=2 \
 			-finline-functions \