Change Android build configurations (step 1).

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 1919 matching lines @@
           }],
           ['OS=="linux"', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
                   '<@(release_extra_cflags)',
                 ],
               }],
             ],
           }],
-          # 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.

-          }],
         ],
       },
       #
       # Concrete configurations
       #
       'Debug': {
         'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
       },
       'Release': {
         'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
@@ skipping 65 matching lines @@
             },
             'defines': [
               '_DEBUG',
             ],
             'cflags': [
               '-O>(debug_optimize)',
               '-g',
             ],
             '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',
-                    ],
-                  }],
-                 ],
-              }],
-            ],
           },
           'Release_Base': {
             'variables': {
               'release_optimize%': '2',
               # Binaries become big and gold is unable to perform GC
               # and remove unused sections for some of test targets
               # on 32 bit platform.
               # (This is currently observed only in chromeos valgrind bots)
               # The following flag is to disable --gc-sections linker
               # option for these bots.
@@ skipping 426 matching lines @@
 
         # Placing this variable here prevents from forking libvpx, used
         # by remoting.  Remoting is off, so it needn't built,
         # so forking it's deps seems like overkill.
         # But this variable need defined to properly run gyp.
         # A proper solution is to have an OS==android conditional
         # in third_party/libvpx/libvpx.gyp to define it.
         '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.
           # These are based on the setup.mk file from the Android NDK.
           #
           # The NDK Android executable link step looks as follows:
           #  $LDFLAGS
           #  $(TARGET_CRTBEGIN_DYNAMIC_O)  <-- crtbegin.o
           #  $(PRIVATE_OBJECTS)            <-- The .o that we built
           #  $(PRIVATE_STATIC_LIBRARIES)   <-- The .a that we built
@@ skipping 830 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }