Second attempt at fixing Ninja build for Android and change make for host os optionally use goma

Now, to build with goma, you must:
1) Set $GOMA_DIR
2) Specify Goma in the path such as:
PATH=$GOMA_DIR/android/:$PATH ninja -j250 -C out/Release base_unittests_apk

"2)" above is necessary temporarily until the *_target variables are removed from build/android/envsetup.sh 

Review URL: https://chromiumcodereview.appspot.com/10834296

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151532 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -3330,16 +3330,16 @@
         ['LINK.host', '$(LINK)'],
       ],
     }],
-    ['OS=="android" and clang==0 and "<(GENERATOR)"!="ninja"', {
+    ['OS=="android" and clang==0', {
       # 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++)'],
+        ['CC.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which gcc))'],
+        ['CXX.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'],
+        ['LINK.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'],
       ],
     }],
   ],