commit c4386e4112d317c14b975ee6706a1a0d3455af37
author Mike Reed <reed@google.com> Fri Nov 06 11:35:02 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 06 11:35:02 2009 -0800
tree 304e7336e3ab131e98ebd5f97812404ddecaa210
parent 78562c4174e3b0344b88f293b4d091d1340bf650
parent ebed06a259eb1c00112a4e3a9d6d721700bbaedb

am ebed06a2: am 65a731b7: Merge change I8dd26ee4 into eclair-mr2

Merge commit 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb'

* commit 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb':
  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 c826831..8bf5f88 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 \