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

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index cd2e4bf1a35cbbfd49ea4f957dd56e4b492278a8..1ef7800685dbad31cc3ddded27e17e82c9055510 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -897,7 +897,7 @@
             '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)',
         },
@@ -963,12 +963,10 @@
         # 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,
           }, {
             'linux_breakpad%': 0,
@@ -2190,13 +2188,27 @@
                     'cflags': [
                       '-march=armv7-a',
                       '-mtune=cortex-a8',
-                      '-mfloat-abi=<(arm_float_abi)',

[Ami GONE FROM CHROMIUM, 2012/07/24 18:06:28]

Why did you remove this? 

[Yaron, 2012/07/24 18:16:45]

I was merging in changes from downstream. The condition was pushed into the
clang sections below but the changes we had were specific to Android.
Unfortunately I didn't give this enough scrutiny pushing it up. Sorry for the
breakage.

                     ],
                     'conditions': [
                       ['arm_neon==1', {
                         'cflags': [ '-mfpu=neon', ],
                       }, {
                         'cflags': [ '-mfpu=<(arm_fpu)', ],
+                      }],
+                      ['clang==1', {
+                        'cflags': [ '-mfloat-abi=soft', ],

[Ami GONE FROM CHROMIUM, 2012/07/24 18:06:28]

This is broken for cros/arm builds (which don't use clang AFAIK, but still).

+                        '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', ],

[Ami GONE FROM CHROMIUM, 2012/07/24 18:06:28]

This is just busted.  It hardcodes softfp for all builds, which breaks ffmpeg on
cros/arm, for example.

                       }]
                     ],
                   }],
@@ -2214,6 +2226,13 @@
                       '-fno-tree-sra',
                       '-Wno-psabi',
                     ],
+                    'cflags_cc': [
+                      # TODO(beverloo): WebKit warns about using the "nullptr"
+                      # 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. (crbug/138166)
+                      '-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
@@ -2515,7 +2534,6 @@
               '-pthread',  # Not supported by Android toolchain.
             ],
             'cflags': [
-              '-U__linux__',  # Don't allow toolchain to claim -D__linux__
               '-ffunction-sections',
               '-funwind-tables',
               '-g',
@@ -2523,19 +2541,13 @@
               '-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.
@@ -2559,9 +2571,34 @@
               ['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)',
@@ -2632,8 +2669,22 @@
                   # 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.
@@ -3268,13 +3319,27 @@
     ['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++)'],
+          ],
+        },
+        ],
       ],
     }],
   ],