Enable assertions and debugging code in the release...

SConstruct

Index: SConstruct
===================================================================
--- SConstruct	(revision 3745)
+++ SConstruct	(working copy)
@@ -113,7 +113,8 @@
   'gcc': {
     'all': {
       'CCFLAGS':      ['$DIALECTFLAGS', '$WARNINGFLAGS'],
-      'CXXFLAGS':     ['$CCFLAGS', '-fno-rtti', '-fno-exceptions'],
+      'CXXFLAGS':     ['$CCFLAGS', '-fno-rtti', '-fno-exceptions',
+                       '-fno-strict-aliasing'],
     },
     'visibility:hidden': {
       # Use visibility=default to disable this.
@@ -129,9 +130,10 @@
     'mode:release': {
       'CCFLAGS':      ['-O3', '-fomit-frame-pointer', '-fdata-sections',
                        '-ffunction-sections'],
+      'CPPDEFINES':   ['DEBUG'],
       'os:android': {
         'CCFLAGS':    ['-mthumb', '-Os'],
-        'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
+        'CPPDEFINES': ['SK_RELEASE']
       }
     },
     'os:linux': {
@@ -231,6 +233,7 @@
     },
     'mode:release': {
       'CCFLAGS':      ['/O2'],
+      'CPPDEFINES':   ['_DEBUG', 'DEBUG'],
       'LINKFLAGS':    ['/OPT:REF', '/OPT:ICF'],
       'msvcrt:static': {
         'CCFLAGS': ['/MT']
@@ -377,7 +380,7 @@
       'LINKFLAGS':    ANDROID_LINKFLAGS,
       'LIBS':         ['log', 'c', 'stdc++', 'm'],
       'mode:release': {
-        'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
+        'CPPDEFINES': ['SK_RELEASE']
       }
     },
   },
@@ -436,7 +439,7 @@
       'LINKFLAGS':    ANDROID_LINKFLAGS,
       'LIBS':         ['log', 'c', 'stdc++', 'm'],
       'mode:release': {
-        'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
+        'CPPDEFINES': ['SK_RELEASE']
       }
     },
     'arch:ia32': {