Add gomadir for GYP_DEFINES

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 92 matching lines @@
         'target_arch%': '<(host_arch)',
 
         # Sets whether we're building with the Android SDK/NDK (and hence with
         # Ant, value 0), or as part of the Android system (and hence with the
         # Android build system, value 1).
         'android_build_type%': 0,
 
         # Sets whether chrome is built for google tv device.
         'google_tv%': 0,
 
+        # goma settings.
+        # 1 to use goma if user specified gomadir.
+        # 0 not to use goma even if user specified gomadir.
+        'use_goma%': 1,
+
         'conditions': [
           # Set default value of toolkit_views based on OS.
           ['OS=="win" or chromeos==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
 
           # Set toolkit_uses_gtk for the Chromium browser on Linux.
           ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
@@ skipping 24 matching lines @@
             'enable_message_center%': 1,
           }, {
             'enable_message_center%': 0,
           }],
 
           ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="android")', {
             'use_default_render_theme%': 1,
           }, {
             'use_default_render_theme%': 0,
           }],
+
+          # goma settings
+          # TODO(ukai): download goma in default dir
+          #  by gclient hooks (as clang prebuilt binary).
+          ['OS=="android"', {
+            # On android, ANDROID_GOMA_WRAPPER might be gomacc path
+            # see build/android/envsetup.sh
+            'gomadir%': '<!(dirname ${ANDROID_GOMA_WRAPPER})',
+          },{
+            'gomadir%': '',
+          }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'host_arch%': '<(host_arch)',
       'target_arch%': '<(target_arch)',
       'toolkit_views%': '<(toolkit_views)',
       'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
       'use_openssl%': '<(use_openssl)',
       'enable_viewport%': '<(enable_viewport)',
       'enable_hidpi%': '<(enable_hidpi)',
       'enable_touch_ui%': '<(enable_touch_ui)',
       'android_build_type%': '<(android_build_type)',
       'google_tv%': '<(google_tv)',
+      'use_goma%': '<(use_goma)',
+      'gomadir%': '<(gomadir)',
       'enable_app_list%': '<(enable_app_list)',
       'enable_message_center%': '<(enable_message_center)',
       'use_default_render_theme%': '<(use_default_render_theme)',
       'buildtype%': '<(buildtype)',
 
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
 
       # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
       # are built under a chromium full build (1) or a webkit.org chromium
@@ skipping 441 matching lines @@
           'linux_breakpad%': 0,
           'linux_use_tcmalloc%': 0,
           # sysroot needs to be an absolute path otherwise it generates
           # incorrect results when passed to pkg-config
           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
         }], # OS=="linux" and target_arch=="arm" and chromeos==0
 
         ['target_arch=="mipsel"', {
           'sysroot': '<!(cd <(DEPTH) && pwd -P)/native_client/toolchain/linux_mips-trusted/sysroot',
         }],
+
+        ['use_goma==1 and gomadir!=""', {
+          # Start goma and check whether it is available or not.
+          'conditions': [
+            ['OS!="win"', {
+              'goma_status':
+              '<!(<(gomadir)/goma_ctl.sh ensure_start >/dev/null 2>&1 && echo ok)'
+            }, {
+              'goma_status':
+              '<!(python <(gomadir)/goma_ctl.py ensure_start >/dev/null 2>/dev/null && echo ok)'

[iannucci, 2013/03/08 04:04:09]

It's really too bad we can't just use goma_ctl for both win and !win..

Also, I don't think >/dev/null is going to work how you expect on windows :).
Maybe add a --print-ok flag to goma_ctl?

I suppose it's OK to setup goma at gyptime... users will need to be educated
about this though. If I reboot my machine and try to build, I'll have a broken
config.

The BEST thing would be to generate an action which everything depends on
implicitly (I'm thinking: inject a dependency into everything with a global
target_defaults). If the goma setup fails at compile time, the user would need
to re-gyp with goma off (or try the build again after fixing whatever prevented
goma from starting).

[ukai, 2013/03/08 06:52:05]

Oh, fixed to use NUL.
Hmm, let me think...

+            }],
+          ]
+        },{
+          'goma_status': '',
+        }],
       ],
 
       # Set this to 1 to use the Google-internal file containing
       # official API keys for Google Chrome even in a developer build.
       # Setting this variable explicitly to 1 will cause your build to
       # fail if the internal file is missing.
       #
       # Set this to 0 to not use the internal file, even when it
       # exists in your checkout.
       #
@@ skipping 111 matching lines @@
     'enable_message_center%': '<(enable_message_center)',
     'use_default_render_theme%': '<(use_default_render_theme)',
     'enable_settings_app%': '<(enable_settings_app)',
     'use_official_google_api_keys%': '<(use_official_google_api_keys)',
     'google_api_key%': '<(google_api_key)',
     'google_default_client_id%': '<(google_default_client_id)',
     'google_default_client_secret%': '<(google_default_client_secret)',
     'enable_managed_users%': '<(enable_managed_users)',
     'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
     'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
+    'use_goma%': '<(use_goma)',
+    'gomadir%': '<(gomadir)',
+    'goma_status%': '<(goma_status)',
 
     # Use system ffmpeg instead of bundled one.
     'use_system_ffmpeg%': 0,
 
     # Use system mesa instead of bundled one.
     'use_system_mesa%': 0,
 
     # Use system nspr instead of the bundled one.
     'use_system_nspr%': 0,
 
@@ skipping 238 matching lines @@
     'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
 
     'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',
     'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
 
     # Whether we are using the rlz library or not.  Platforms like Android send
     # rlz codes for searches but do not use the library.
     'enable_rlz%': 0,
 
     'conditions': [
+      ['goma_status=="ok" and OS=="win"', {
+        # goma doesn't support pch yet.
+        'chromium_win_pch': 0,
+        # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1.
+        'conditions': [
+          ['win_z7==0', {
+            'fastbuild': 1,

[iannucci, 2013/03/08 04:04:09]

At first I didn't like this, but now that I think about it, this seems pretty
good since as soon as goma supports PCH and/or PDB, we can just change it here
in the gypfile instead of on all the masters (and devs will get support for
these features too). Also, if we discover some optional feature doesn't work
with goma, we can disable it here too.

+           }],
+        ],
+      }],
+
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
         'windows_sdk_path%': '<(windows_sdk_default_path)',
       }, {
         'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
       }],
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
         'directx_sdk_path%': '<(directx_sdk_default_path)',
       }, {
         'directx_sdk_path%': '$(DXSDK_DIR)',
       }],
@@ skipping 2989 matching lines @@
       },
     }],
     ['enable_new_npdevice_api==1', {
       'target_defaults': {
         'defines': [
           'ENABLE_NEW_NPDEVICE_API',
         ],
       },
     }],
     ['clang==1', {
-      '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++)'],
-            ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CHROME_SRC}/<(make_clang_dir)/bin/clang++)'],
-            ['CC.host', '$(CC)'],
-            ['CXX.host', '$(CXX)'],
-            ['LINK.host', '$(LINK)'],
-          ],
-        }, {
-          'make_global_settings': [
-            ['CC', '<(make_clang_dir)/bin/clang'],
-            ['CXX', '<(make_clang_dir)/bin/clang++'],
-            ['LINK', '$(CXX)'],
-            ['CC.host', '$(CC)'],
-            ['CXX.host', '$(CXX)'],
-            ['LINK.host', '$(LINK)'],
-          ],
-        }],
+      'make_global_settings': [
+        ['CC', '<(make_clang_dir)/bin/clang'],
+        ['CXX', '<(make_clang_dir)/bin/clang++'],
+        ['LINK', '$(CXX)'],
+        ['CC.host', '$(CC)'],
+        ['CXX.host', '$(CXX)'],
+        ['LINK.host', '$(LINK)'],
       ],
     }],
     ['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', '<!(/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++))'],
+        ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'],
+        ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'],
+        ['LINK', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'],
+        ['CC.host', '<!(which gcc)'],
+        ['CXX.host', '<!(which g++)'],
+        ['LINK.host', '<!(which g++)'],
       ],
     }],
     ['target_arch=="mipsel"', {
       'make_global_settings': [
         ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'],
         ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'],
         ['LINK', '$(CXX)'],
         ['CC.host', '<!(which gcc)'],
         ['CXX.host', '<!(which g++)'],
         ['LINK.host', '<!(which g++)'],
       ],
     }],
+
+    # TODO(ukai): supports GENERATOR==make
+    #  make generator doesn't support CC_wrapper without CC
+    #  in make_global_settings yet.

[iannucci, 2013/03/08 04:04:09]

AFAIK, nothing uses goma with Make currently, and we don't plan to in the
future.

[ukai, 2013/03/08 06:52:05]

Oh, really?
Linux Builder x64, for instance, uses goma with make.
http://build.chromium.org/p/chromium.linux/builders/Linux%20Builder%20x64

/b/build/goma/goma_ctl.sh ensure_start
Using goma VERSION=37 (no_auto_update)...
Checking running compiler_proxy ...
GOMA version f0c845b57d1e5b51e44b672dec2be7e89f75b2e8@1360723428
waiting for compiler_proxy's unix domain socket...20
compiler proxy (pid=29804) status:  http://127.0.0.1:8088/ alive

Now goma is ready!

using goma
Environment variables set in compile.py:
  CC=gcc
  CXX=g++
  GOMA_API_KEY_FILE=/b/build/goma/goma.key
 
PATH=/b/build/goma:/home/chrome-bot/slavebin:/b/depot_tools:/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin


make -k CC.host=gcc CXX.host=g++ -j100 base_unittests browser_tests
cacheinvalidation_unittests cc_unittests chrome chromedriver2_unittests
components_unittests content_browsertests content_unittests crypto_unittests
dbus_unittests device_unittests googleurl_unittests gpu_unittests
interactive_ui_tests ipc_tests jingle_unittests media_unittests net_unittests
ppapi_unittests printing_unittests remoting_unittests sandbox_linux_unittests
sql_unittests sync_unit_tests ui_unittests unit_tests
webkit_compositor_bindings_unittests sync_integration_tests BUILDTYPE=Release

[iannucci, 2013/03/08 06:54:10]

You're completely right, I'm not sure what I was thinking >_<

+    ['goma_status=="ok" and ("<(GENERATOR)"=="ninja" or clang==1 or OS=="android")', {
+      'make_global_settings': [
+       ['CC_wrapper', '<(gomadir)/gomacc'],
+       ['CXX_wrapper', '<(gomadir)/gomacc'],
+       ['CC.host_wrapper', '<(gomadir)/gomacc'],
+       ['CXX.host_wrapper', '<(gomadir)/gomacc'],
+       # TODO(ukai): link support
+       # ['LINK_wrapper', '<(gomadir)/gomacc'],
+       # ['LINK.host_wrapper', '<(gomadir)/gomacc']
+      ],
+    }],
   ],
   'xcode_settings': {
     # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
     # This block adds *project-wide* configuration settings to each project
     # file.  It's almost always wrong to put things here.  Specify your
     # custom xcode_settings in target_defaults to add them to targets instead.
 
     'conditions': [
       # In an Xcode Project Info window, the "Base SDK for All Configurations"
       # setting sets the SDK on a project-wide basis. In order to get the
@@ skipping 39 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',
   },
 }