From 14591ce728525ab065d71a8598f9b201d0395db8 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Tue, 3 Nov 2015 13:12:46 -0800 Subject: Merge to XFA: Add support for building with goma. TBR=thestig@chromium.org clean merge. Review URL: https://codereview.chromium.org/1428093004 . (cherry picked from commit e35b445bee90390ea09f334cbff4a6220537bbda) Review URL: https://codereview.chromium.org/1418453007 . --- build/standalone.gypi | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'build/standalone.gypi') diff --git a/build/standalone.gypi b/build/standalone.gypi index a70b442bee..3d256693ca 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -10,6 +10,8 @@ 'clang%': 0, 'asan%': 0, 'sanitizer_coverage%': 0, + 'use_goma%': 0, + 'gomadir%': '', 'msvs_multi_core_compile%': '1', 'variables': { 'variables': { @@ -58,6 +60,12 @@ }, { 'clang%': 0, }], + # Set default gomadir. + ['OS=="win"', { + 'gomadir%': 'c:\\goma\\goma-win', + }, { + 'gomadir%': '