Change Android build configurations (step 1).

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 3f64fa96e10e8cb83e6fac866efed49dcd81935c..b9d95f0c63b6acdb62e730507c88c62cceae7064 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1937,10 +1937,6 @@
               }],
             ],
           }],
-          # Android enables DCHECK()s on non-Official release builds.
-          ['OS=="android" and buildtype!="Official"', {
-            'defines!': ['NDEBUG'],

[Torne, 2012/08/13 15:08:28]

Removing this now seems like a bad idea. If this is changed before we switch the
default, this means that *nobody* will be building with DCHECKs enabled, which
means there is a serious risk they will regress and become broken. Can we land
the change to update the Debug configuration, then switch the default to Debug,
and *then* remove DCHECKs from Release instead please?

[Xianzhu, 2012/08/13 16:58:35]

Agreed. Done.

-          }],
         ],
       },
       #
@@ -2026,25 +2022,22 @@
             ],
             'conditions' : [
               ['OS=="android"', {
+                # Some configurations are copied from Release_Base to reduce
+                # the binary size.
+                'variables': {
+                  'debug_optimize%': 's',
+                },
                 'cflags': [
-                  '-fno-omit-frame-pointer',
+                  '-fno-ident',
+                  '-fomit-frame-pointer',
+                  '-fdata-sections',
+                  '-ffunction-sections',
+                ],
+                'ldflags': [
+                  '-Wl,-O1',
+                  '-Wl,--as-needed',
+                  '-Wl,--gc-sections',
                 ],
-              }],
-            ],
-            'target_conditions' : [
-              ['_toolset=="target"', {
-                'conditions': [
-                  ['OS=="android" and debug_optimize==0 and target_arch=="arm"', {
-                    'cflags': [
-                      '-mlong-calls',  # Needed when compiling with -O0
-                    ],
-                  }],
-                  ['arm_thumb==1', {
-                    'cflags': [
-                      '-marm',
-                    ],
-                  }],
-                 ],
               }],
             ],
           },
@@ -2493,16 +2486,15 @@
         'libvpx_path': 'lib/linux/arm',
       },
       'target_defaults': {
-        # Build a Release build by default to match Android build behavior.
-        # This is typical with Android because Debug builds tend to be much
-        # larger and run very slowly on constrained devices. It is still
-        # possible to do a Debug build by specifying BUILDTYPE=Debug on the
-        # 'make' command line.
+        # 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%': '',
-         },
+        },
 
         'target_conditions': [
           # Settings for building device targets using Android's toolchain.