Chrome on Android: fix cross-compilation setup.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 1eaa78a174e4e157a83fda3971dfad03f8995548..c41e6f97ace5f110961345a936e5ec7f37343858 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2262,7 +2262,7 @@
             'libraries': [
               '-l<(android_stlport_library)',
               # Manually link the libgcc.a that the cross compiler uses.
-              '<!($CROSS_CC -print-libgcc-file-name)',
+              '<!(/bin/echo -n $LIBGCC_FILE_NAME)',
               '-lc',
               '-ldl',
               '-lstdc++',
@@ -2868,7 +2868,7 @@
         ],
       },
     }],
-    ['clang==1', {
+    ['clang==1 and OS!="android"', {
       'make_global_settings': [
         ['CC', '<(make_clang_dir)/bin/clang'],
         ['CXX', '<(make_clang_dir)/bin/clang++'],
@@ -2878,6 +2878,16 @@
         ['LINK.host', '$(LINK)'],
       ],
     }],
+    ['OS=="android"', {
+      '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)'],
+      ],
+    }],
   ],
   'xcode_settings': {
     # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!