Use thumb versions of external libraries with ARMv7.

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 4614 matching lines @@
                   # to say that it does. Define them here instead.
                   'HAVE_SYS_UIO_H',
                 ],
                 'cflags': [
                   '--sysroot=<(android_ndk_sysroot)',
                 ],
                 'ldflags': [
                   '--sysroot=<(android_ndk_sysroot)',
                   '-nostdlib',
                 ],
-                'libraries': [
-                  '-l<(android_stlport_library)',
-                  # Manually link the libgcc.a that the cross compiler uses.
-                  '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
-                  '-lc',
-                  '-ldl',
-                  '-lm',
+                'conditions': [
+                  ['target_arch=="arm" and arm_thumb==1', {
+                    'libraries': [
+                      '-l<(android_stlport_library)',
+                      # Manually link the libgcc.a that the cross compiler uses.
+                      '<!(<(android_toolchain)/*-gcc -mthumb -print-libgcc-file-name)',

[pasko, 2014/11/03 16:47:15]

I suspect we can expand a variable here to be either '-mthumb' or ''. A variable
can be named something like 'thumb_mode_gcc'.

I'd prefer that to avoid copying the -l{c,dl,m} etc all over.

[Fabrice (no longer in Chrome), 2014/11/03 18:00:41]

Done.

+                      '-lc',
+                      '-ldl',
+                      '-lm',
+                    ],
+                  }, {
+                    'libraries': [
+                      '-l<(android_stlport_library)',
+                      # Manually link the libgcc.a that the cross compiler uses.
+                      '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
+                      '-lc',
+                      '-ldl',
+                      '-lm',
+                    ],
+                  }],
                 ],
               }],
               ['android_webview_build==1', {
                 'cflags': [
                   # Android predefines this as 1; undefine it here so Chromium
                   # can redefine it later to be 2 for chromium code and unset
                   # for third party code. This works because cflags are added
                   # before defines.
                   '-U_FORTIFY_SOURCE',
                   # Disable any additional warnings enabled by the Android build system but which
@@ skipping 41 matching lines @@
               # NOTE: The stlport header include paths below are specified in
               # cflags rather than include_dirs because they need to come
               # after include_dirs. Think of them like system headers, but
               # don't use '-isystem' because the arm-linux-androideabi-4.4.3
               # toolchain (circa Gingerbread) will exhibit strange errors.
               # The include ordering here is important; change with caution.
               ['android_webview_build==0', {
                 'cflags': [
                   '-isystem<(android_stlport_include)',
                 ],
-                'ldflags': [
-                  '-L<(android_stlport_libs_dir)',
+                'conditions': [
+                  ['target_arch=="arm" and arm_thumb==1', {
+                    'ldflags': [ '-L<(android_stlport_libs_dir)/thumb' ]
+                  }, {
+                    'ldflags': [ '-L<(android_stlport_libs_dir)' ]
+                  }],
                 ],
               }, { # else: android_webview_build!=0
                 'aosp_build_settings': {
                   # Specify that we want to statically link stlport from the
                   # NDK. This will provide all the include and library paths
                   # automatically at build time, and link the right library.
                   'LOCAL_NDK_STL_VARIANT': 'stlport_static',
                 },
               }],
               ['target_arch=="ia32"', {
@@ skipping 1166 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',
   },
 }