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

Unified Diff: build/common.gypi

Issue 142393002: android: Use use_goma=1 gomadir gyp defines instead of magic GOMA_DIR env var. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nowat Created 6 years, 11 months 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/android/envsetup.sh ('k') | build/toolchain/android/default_goma_for_android.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 160e3db669b7a5a37f41a79889bdca03d8a9e7f3..d005e6e897f3888b292de0925941a3f5f4d425be 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -116,12 +116,6 @@
'use_ozone%': 1,
}],
- ['OS=="android"', {
- 'android_goma_dir%': '<!(echo "${GOMA_DIR}")',
- }, {
- 'android_goma_dir%': ''
- }],
-
['embedded==1', {
'use_system_fontconfig%': 0,
}, {
@@ -228,12 +222,7 @@
# Set default gomadir.
['OS=="win"', {
'gomadir': 'c:\\goma\\goma-win',
- }],
- ['android_goma_dir!=""', {
- 'use_goma': 1,
- 'gomadir': '<(android_goma_dir)',
- }],
- ['OS!="win" and android_goma_dir==""', {
+ }, {
'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
}],
],
« no previous file with comments | « build/android/envsetup.sh ('k') | build/toolchain/android/default_goma_for_android.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698