Change Android build configurations (step 3).

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 096b0c691016ea8a45d988212dd502d181149aa7..acd02ce407aaff4545ccb7709360953a1a0c0984 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -848,6 +848,9 @@
     # Native Client is enabled by default.
     'disable_nacl%': 0,
 
+    # Whether to build full debug version for Debug configuratoin on Android.

[Satish, 2012/08/20 11:30:36]

please also explain what 'full debug' means in this comment, i.e. it includes no
optimisations as well

[Satish, 2012/08/20 11:30:36]

configuratoin -> configuration

[Xianzhu, 2012/08/20 18:12:43]

Done.

[Xianzhu, 2012/08/20 18:12:43]

Done.

+    'android_full_debug%': 0,
+
     'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
     'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
 
@@ -1940,12 +1943,6 @@
               }],
             ],
           }],
-          # TODO(wangxianzhu): Remove this. This is temporarily kept before
-          # default build type switched to Debug.
-          # Android enables DCHECK()s on non-Official release builds.
-          ['OS=="android" and buildtype!="Official"', {
-            'defines!': ['NDEBUG'],
-          }],
         ],
       },
       #
@@ -2030,7 +2027,7 @@
               '-g',
             ],
             'conditions' : [
-              ['OS=="android"', {
+              ['OS=="android" and android_full_debug==0', {
                 # Some configurations are copied from Release_Base to reduce
                 # the binary size.
                 'variables': {
@@ -2503,12 +2500,6 @@
         'libvpx_path': 'lib/linux/arm',
       },
       'target_defaults': {
-        # TODO(wangxianzhu): We used to build Release version with DCHECK
-        # by default. Now we build Release without DCHECK, and build Debug
-        # with size optimizations. Remove the following line after everyone
-        # knows how to deal with the change.
-        'default_configuration': 'Release',
-
         'variables': {
           'release_extra_cflags%': '',
         },