[Android] Add remaining build/common.gypi changes from downstream.

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 879 matching lines @@
               ['target_arch=="arm" and armv7==1', {
                 'android_app_abi%': 'armeabi-v7a',
               }],
             ],
 
             # Switch between different build types, currently only '0' is
             # supported.
             'android_build_type%': 0,
           },
           'android_ndk_root%': '<(android_ndk_root)',
-          'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(target_arch)',
+          'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/arch-<(target_arch)',
           'android_build_type%': '<(android_build_type)',
           'android_app_abi%': '<(android_app_abi)',
         },
         'android_ndk_root%': '<(android_ndk_root)',
         'android_ndk_sysroot': '<(android_ndk_sysroot)',
         'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
         'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
         'android_app_abi%': '<(android_app_abi)',
 
         # Provides an absolute path to PRODUCT_DIR (e.g. out/Release). Used
@@ skipping 45 matching lines @@
         'use_libffmpeg%': '0',
 
         # Always use the chromium skia. The use_system_harfbuzz needs to
         # match use_system_skia.
         'use_system_skia%': '0',
         'use_system_harfbuzz%': '0',
 
         # Always use the system zlib.
         'use_system_zlib%': 1,
 
+        # Configure crash reporting and build options based on release type.
         'conditions': [
-          # Determine whether or not to use breakpad crash reporting for native
-          # code. Java code stacktraces will be collected by GoogleFeedback when
-          # chrome is installed by either market or bazaar where the installer
-          # package is automatically set to AndroidFeedback.
           ['buildtype=="Official"', {
+            # Only report crash dumps for Official builds.
             'linux_breakpad%': 1,
+            'defines': [
+              # Silence NOTIMPLEMENTED()s on Official builds.
+              'NOTIMPLEMENTED_POLICY=0'

[John Grabowski, 2012/07/19 23:33:00]

Not sure what to think of this.  I'll add an extra reviewer to confirm this is a
good idea.

[Yaron, 2012/07/20 00:16:40]

It was originally added as part of b/5364886 with the goal to reduce logging for
released builds. I'm not sure it's really valuable to include this.. isn't it
more useful for dev builds? I'm fine with removing it if it's preferred.

[John Grabowski, 2012/07/20 00:17:48]

I'd guess it's fine but there may be specific policies about this.  mento would
know.

+            ],
           }, {
             'linux_breakpad%': 0,
           }],
         ],
 
         # TODO(steveblock): Investigate using the system versions of sqlite and
         # libjpeg.
         # Enable to use system sqlite.
         'use_system_sqlite%': 0,  # '<(android_build_type)',
         # Enable to use system libjpeg.
@@ skipping 1200 matching lines @@
                 'conditions': [
                   ['arm_thumb==1', {
                     'cflags': [
                     '-mthumb',
                     ]
                   }],
                   ['armv7==1', {
                     'cflags': [
                       '-march=armv7-a',
                       '-mtune=cortex-a8',
-                      '-mfloat-abi=<(arm_float_abi)',
                     ],
                     'conditions': [
                       ['arm_neon==1', {
                         'cflags': [ '-mfpu=neon', ],
                       }, {
                         'cflags': [ '-mfpu=<(arm_fpu)', ],
+                      }],
+                      ['clang==1', {
+                        'cflags': [ '-mfloat-abi=soft', ],
+                        'cflags!': [
+                          # -mfpu handling in Clang is broken.
+                          '-mfpu=neon',
+                          '-mfpu=<(arm_fpu)',
+                          # Clang does not support the following options.
+                          '-mthumb-interwork',
+                          '-finline-limit=64',
+                          '-fno-tree-sra',
+                          '-Wno-psabi',
+                        ],
+                      }, {
+                        'cflags': [ '-mfloat-abi=softfp', ],
                       }]
                     ],
                   }],
                   ['OS=="android"', {
                     # Most of the following flags are derived from what Android
                     # uses by default when building for arm, reference for which
                     # can be found in the following file in the Android NDK:
                     # toolchains/arm-linux-androideabi-4.4.3/setup.mk
                     'cflags': [
                       # The tree-sra optimization (scalar replacement for
                       # aggregates enabling subsequent optimizations) leads to
                       # invalid code generation when using the Android NDK's
                       # compiler (r5-r7). This can be verified using
                       # TestWebKitAPI's WTF.Checked_int8_t test.
                       '-fno-tree-sra',
                       '-Wno-psabi',
                     ],
+                    'cflags_cc': [
+                      # TODO(beverloo): WebKit warns about using the "nullptr"

[John Grabowski, 2012/07/19 23:33:00]

bug#?

[Yaron, 2012/07/20 00:16:40]

filed crbug.com/138166

+                      # identifier in NullPtr.h, which actually is valid usage.
+                      # We should remove this flag once we know why the warning
+                      # suddenly shows up on JellyBean.
+                      '-Wno-c++0x-compat',
+                    ],
                     # Android now supports .relro sections properly.
                     # NOTE: While these flags enable the generation of .relro
                     # sections, the generated libraries can still be loaded on
                     # older Android platform versions.
                     'ldflags': [
                         '-Wl,-z,relro',
                         '-Wl,-z,now',
                     ],
                     'conditions': [
                       ['arm_thumb == 1', {
@@ skipping 281 matching lines @@
           # libgcc.a to the start of libraries which puts it in the
           # proper spot after .o and .a files get linked in.
           #
           # TODO: The proper thing to do longer-tem would be proper gyp
           # support for a custom link command line.
           ['_toolset=="target"', {
             'cflags!': [
               '-pthread',  # Not supported by Android toolchain.
             ],
             'cflags': [
-              '-U__linux__',  # Don't allow toolchain to claim -D__linux__
               '-ffunction-sections',
               '-funwind-tables',
               '-g',
               '-fstack-protector',
               '-fno-short-enums',
               '-finline-limit=64',
               '-Wa,--noexecstack',
-              '-Wno-error=non-virtual-dtor',  # TODO(michaelbai): Fix warnings.
               '<@(release_extra_cflags)',
-              # Note: This include is in cflags to ensure that it comes after
-              # all of the includes.
-              '-I<(android_ndk_include)',
             ],
             'defines': [
               'ANDROID',
               '__GNU_SOURCE=1',  # Necessary for clone()
               'USE_STLPORT=1',
               '_STLP_USE_PTR_SPECIALIZATIONS=1',
-              'HAVE_SYS_UIO_H',
-              'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize.
             ],
             'ldflags!': [
               '-pthread',  # Not supported by Android toolchain.
             ],
             'ldflags': [
               '-nostdlib',
               '-Wl,--no-undefined',
               # Don't export symbols from statically linked libraries.
               '-Wl,--exclude-libs=ALL',
             ],
             'libraries': [
               '-l<(android_stlport_library)',
               # Manually link the libgcc.a that the cross compiler uses.
               '<!(${ANDROID_TOOLCHAIN}/*-gcc -print-libgcc-file-name)',
               '-lc',
               '-ldl',
               '-lstdc++',
               '-lm',
             ],
             'conditions': [
               ['android_upstream_bringup==1', {
                 'defines': ['ANDROID_UPSTREAM_BRINGUP=1',],
               }],
+              ['asan==1', {
+                'ldflags!': [
+                  # On Android, we link ASan runtime explicitly and
+                  # don't need -faddress-sanitizer in link flags.
+                  '-faddress-sanitizer',
+                ],
+                'libraries': [
+                  '<(android_lib)/libasan_preload.so',
+                ],
+                'cflags': [
+                  # Clang relies on -Wl,--gc-sections removing unreachable code.
+                  # ASan instrumentation for globals inhibits this and results
+                  # in a library with unresolvable relocations.
+                  # TODO(eugenis): find a way to reenable this.
+                  '-mllvm -asan-globals=0',
+                  # Asan uses a zero-based sandbox on Android. The following
+                  # option can be removed once Clang is updated past r157318
+                  '-mllvm -asan-mapping-offset-log=0',
+                  ],
+                }],
               ['android_build_type==0', {
                 'defines': [
-                  'HAVE_OFF64_T',
+                  # The NDK has these things, but doesn't define the constants
+                  # to say that it does. Define them here instead.
+                  'HAVE_SYS_UIO_H',
+                ],
+                'cflags': [
+                  '--sysroot=<(android_ndk_sysroot)',
                 ],
                 'ldflags': [
                   '--sysroot=<(android_ndk_sysroot)',
                 ],
               }],
               ['target_arch == "arm"', {
                 'ldflags': [
                   # Enable identical code folding to reduce size.
                   '-Wl,--icf=safe',
                 ],
@@ skipping 50 matching lines @@
                   '-Wl,--gc-sections',
                   '-Wl,-z,nocopyreloc',
                   # crtbegin_dynamic.o should be the last item in ldflags.
                   '<(android_ndk_lib)/crtbegin_dynamic.o',
                 ],
                 'libraries': [
                   # crtend_android.o needs to be the last item in libraries.
                   # Do not add any libraries after this!
                   '<(android_ndk_lib)/crtend_android.o',
                 ],
+                'conditions': [
+                  ['asan==1', {
+                    'libraries': [
+                      '<(android_static_lib)/libasan_intermediates/libasan.a',
+                    ],
+                    'cflags': [
+                      '-fPIE',
+                    ],
+                    'ldflags': [
+                      '-Wl,-u,__asan_preinit',
+                      '-pie',
+                    ],
+                  }],
+                ],
               }],
-              ['_type=="shared_library"', {
+              ['_type=="shared_library" or _type=="loadable_module"', {
                 'ldflags': [
                   '-Wl,-shared,-Bsymbolic',
                   # crtbegin_so.o should be the last item in ldflags.
                   '<(android_ndk_lib)/crtbegin_so.o',
                 ],
                 'libraries': [
                   # crtend_so.o needs to be the last item in libraries.
                   # Do not add any libraries after this!
                   '<(android_ndk_lib)/crtend_so.o',
                 ],
@@ skipping 614 matching lines @@
         ['CXX', '<(make_clang_dir)/bin/clang++'],
         ['LINK', '$(CXX)'],
         ['CC.host', '$(CC)'],
         ['CXX.host', '$(CXX)'],
         ['LINK.host', '$(LINK)'],
       ],
     }],
     ['OS=="android" and "<(GENERATOR)"!="ninja"', {
       # Hardcode the compiler names in the Makefile so that
       # it won't depend on the environment at make time.
-      'make_global_settings': [
-        ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
-        ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'],
-        ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
-        ['CC.host', '<!(which gcc)'],
-        ['CXX.host', '<!(which g++)'],
-        ['LINK.host', '<!(which g++)'],
+      'conditions': [
+        ['clang==1', {
+          'make_global_settings': [
+            ['CC', '<!(/bin/echo -n $CROSS_CC)'],
+            ['CXX', '<!(/bin/echo -n $CROSS_CXX)'],
+            ['LINK', '<!(/bin/echo -n $CROSS_LINK)'],
+            ['CC.host', '<!(/bin/echo -n $HOST_CC)'],
+            ['CXX.host', '<!(/bin/echo -n $HOST_CXX)'],
+            ['LINK.host', '<!(/bin/echo -n $HOST_LINK)'],
+          ],
+        }, {
+          'make_global_settings': [
+            ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
+            ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'],
+            ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],
+            ['CC.host', '<!(which gcc)'],
+            ['CXX.host', '<!(which g++)'],
+            ['LINK.host', '<!(which g++)'],
+          ],
+        },
+        ],
       ],
     }],
   ],
   'xcode_settings': {
     # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
     # This block adds *project-wide* configuration settings to each project
     # file.  It's almost always wrong to put things here.  Specify your
     # custom xcode_settings in target_defaults to add them to targets instead.
 
     'conditions': [
@@ skipping 21 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',
   },
 }