Revert 237900 "Add use_goma for GYP_DEFINES"

Broke the blink android build.
TBR=mkwst@chromium.org

> Add use_goma for GYP_DEFINES
> 
> If use_goma is specified in GYP_DEFINES, gomacc is automatically set as
> CC wrapper and CXX wrapper.  It uses the default goma directory if the gomadir
> option is not given.  No need to fix PATH when running ninja (or make).
> This is the revival of https://codereview.chromium.org/12419003/,
> and expected to work with https://codereview.chromium.org/66303010/.
> Note: Goma team suggest not to put gomadir in PATH if you use use_goma option.
> 
> Currently, this works well with ninja (default build system of chromium).
> It does not work well with make in some case (e.g. build on linux with make).
> 
> According to the review comment, ANDROID_GOMA_WRAPPER has already been
> obsoleted.  ANDROID_GOMA_WRAPPER will be just ignored after this change.
> 
> Example 1
> $ GYP_DEFINES="clang=1 use_goma=1" build/gyp_chromium
> (no need to set CC/CXX at this stage)
> 
> build.ninja will have
> cc = ${HOME}/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang
> cxx = ${HOME}/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++
> 
> The user can run ninja without setting PATH or so.
> $ ninja -C out/Release -j100
> 
> Example 2
> 
> $ GYP_DEFINES="use_goma=1 gomadir=/path/to/goma" build/gyp_chromium
> 
> build.ninja will have
> cc = /path/to/goma/gomacc gcc
> cxx = /path/to/goma/gomacc g++
> 
> user can run ninja without setting PATH or so.
> $ ninja -C out/Release -j100
> 
> BUG=173686
> 
> Review URL: https://codereview.chromium.org/69293004

TBR=yyanagisawa@chromium.org

Review URL: https://codereview.chromium.org/96703002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@237911 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -138,11 +138,6 @@
         # Sets whether chrome is built for google tv device.
         'google_tv%': 0,
 
-        # goma settings.
-        # 1 to use goma.
-        # If no gomadir is set, it uses the default gomadir.
-        'use_goma%': 0,
-
         # Set ARM architecture version.
         'arm_version%': 7,
 
@@ -201,14 +196,7 @@
             'use_ozone_evdev%': 1,
           }, {
             'use_ozone_evdev%': 0,
-          }],
-
-          # Set default gomadir.
-          ['OS=="win"', {
-            'gomadir%': 'c:\\goma\\goma-win',
-          }, {
-            'gomadir%': '<!(/bin/echo -n ${HOME}/goma)',
-          }],
+          }]
         ],
       },
 
@@ -231,8 +219,6 @@
       'enable_touch_ui%': '<(enable_touch_ui)',
       'android_webview_build%': '<(android_webview_build)',
       'google_tv%': '<(google_tv)',
-      'use_goma%': '<(use_goma)',
-      'gomadir%': '<(gomadir)',
       'enable_app_list%': '<(enable_app_list)',
       'use_default_render_theme%': '<(use_default_render_theme)',
       'buildtype%': '<(buildtype)',
@@ -972,8 +958,6 @@
     'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)',
     'v8_optimized_debug%': '<(v8_optimized_debug)',
     'proprietary_codecs%': '<(proprietary_codecs)',
-    'use_goma%': '<(use_goma)',
-    'gomadir%': '<(gomadir)',
 
     # Use system nspr instead of the bundled one.
     'use_system_nspr%': 0,
@@ -1887,16 +1871,6 @@
         'ozone_platform_dri%': 0,
         'ozone_platform_test%': 0,
       }],
-      ['OS=="win" and use_goma==1', {
-        # goma doesn't support pch yet.
-        'chromium_win_pch': 0,
-        # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1.
-        'conditions': [
-          ['fastbuild==0', {
-            'win_z7': 1,
-          }],
-        ],
-      }],
     ],
 
 
@@ -4673,21 +4647,33 @@
       },
     }],
     ['clang==1', {
-      'make_global_settings': [
-        ['CC', '<(make_clang_dir)/bin/clang'],
-        ['CXX', '<(make_clang_dir)/bin/clang++'],
-        ['CC.host', '$(CC)'],
-        ['CXX.host', '$(CXX)'],
+      'conditions': [
+        ['OS=="android"', {
+          # Android could use the goma with clang.
+          'make_global_settings': [
+            ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(make_clang_dir)/bin/clang)'],
+            ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(make_clang_dir)/bin/clang++)'],
+            ['CC.host', '$(CC)'],
+            ['CXX.host', '$(CXX)'],
+          ],
+        }, {
+          'make_global_settings': [
+            ['CC', '<(make_clang_dir)/bin/clang'],
+            ['CXX', '<(make_clang_dir)/bin/clang++'],
+            ['CC.host', '$(CC)'],
+            ['CXX.host', '$(CXX)'],
+          ],
+        }],
       ],
     }],
     ['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_toolchain)/*-gcc)'],
-        ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'],
-        ['CC.host', '<!(which gcc)'],
-        ['CXX.host', '<!(which g++)'],
+        ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <(android_toolchain)/*-gcc)'],
+        ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <(android_toolchain)/*-g++)'],
+        ['CC.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which gcc))'],
+        ['CXX.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'],
       ],
     }],
     ['OS=="linux" and target_arch=="mipsel"', {
@@ -4698,18 +4684,6 @@
         ['CXX.host', '<!(which g++)'],
       ],
     }],
-
-    # TODO(yyanagisawa): supports GENERATOR==make
-    #  make generator doesn't support CC_wrapper without CC
-    #  in make_global_settings yet.
-    ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
-      'make_global_settings': [
-       ['CC_wrapper', '<(gomadir)/gomacc'],
-       ['CXX_wrapper', '<(gomadir)/gomacc'],
-       ['CC.host_wrapper', '<(gomadir)/gomacc'],
-       ['CXX.host_wrapper', '<(gomadir)/gomacc'],
-      ],
-    }],
   ],
   'xcode_settings': {
     # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!