Change Android build configurations (step 3).

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 830 matching lines @@
 
     # Disable Dart by default.
     'enable_dart%': 0,
 
     # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
     'msbuild_toolset%': '',
 
     # 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))',
 
     'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',
     'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
 
     'conditions': [
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
         'windows_sdk_path%': '<(windows_sdk_default_path)',
       }, {
@@ skipping 1072 matching lines @@
           }],
           ['OS=="linux"', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
                   '<@(release_extra_cflags)',
                 ],
               }],
             ],
           }],
-          # 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'],
-          }],
         ],
       },
       #
       # Concrete configurations
       #
       'Debug': {
         'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
       },
       'Release': {
         'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
@@ skipping 64 matching lines @@
               'debug_optimize%': '0',
             },
             'defines': [
               '_DEBUG',
             ],
             'cflags': [
               '-O>(debug_optimize)',
               '-g',
             ],
             'conditions' : [
-              ['OS=="android"', {
+              ['OS=="android" and android_full_debug==0', {
                 # Some configurations are copied from Release_Base to reduce
                 # the binary size.
                 'variables': {
                   'debug_optimize%': 's',
                 },
                 'cflags': [
                   '-fomit-frame-pointer',
                   '-fdata-sections',
                   '-ffunction-sections',
                 ],
@@ skipping 452 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': {
-        # 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
@@ skipping 860 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',
   },
 }