Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: build/common.gypi

Issue 66303010: Enables goma from GYP. (Closed) Base URL: http://src.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/build_nexe.py ('k') | build/untrusted.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 12488)
+++ build/common.gypi (working copy)
@@ -86,6 +86,10 @@
# non-Official builds).
'buildtype%': 'Dev',
+ # goma settings.
+ 'use_goma%': 0,
+ 'gomadir%': '',
+
'conditions': [
# Compute the architecture that we're building for. Default to the
# architecture that we're building on.
@@ -112,6 +116,8 @@
'target_arch%': '<(target_arch)',
'branding%': '<(branding)',
'buildtype%': '<(buildtype)',
+ 'use_goma%': '<(use_goma)',
+ 'gomadir%': '<(gomadir)',
'conditions': [
# The system root for cross-compiles. Default: none.
@@ -133,6 +139,8 @@
'branding%': '<(branding)',
'buildtype%': '<(buildtype)',
'component%': '<(component)',
+ 'use_goma%': '<(use_goma)',
+ 'gomadir%': '<(gomadir)',
'nacl_strict_warnings%': 1,
'nacl_validator_ragel%': 1,
« no previous file with comments | « build/build_nexe.py ('k') | build/untrusted.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698