Use thumb versions of external libraries with ARMv7.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index b8a87e09c707e3b6bc7cf47fcd41bbcdd8499e9a..2da419a61530b280d7daccd5d2130e6f8b7dfa60 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4632,13 +4632,26 @@
                   '--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', {
@@ -4700,8 +4713,12 @@
                 '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': {