Add gomadir for GYP_DEFINES

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 591e75cda6fe3a9d3d164e9564dc664a1f83e904..3556d7ea5f829402bf447763497fb69595bbc2be 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -110,6 +110,11 @@
         # 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', {
@@ -154,6 +159,17 @@
           }, {
             '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%': '',
+          }],
         ],
       },
 
@@ -171,6 +187,8 @@
       '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)',
@@ -632,6 +650,21 @@
         ['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
@@ -763,6 +796,9 @@
     '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,
@@ -1021,6 +1057,17 @@
     '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)',
       }, {
@@ -4030,39 +4077,25 @@
       },
     }],
     ['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"', {
@@ -4075,6 +4108,21 @@
         ['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!