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

Unified Diff: scripts/slave/recipes/webrtc_android_apk_trybot.expected/Release_intel.json

Issue 134193014: Make recipes use the new way of enabling goma. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 6 years, 10 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
Index: scripts/slave/recipes/webrtc_android_apk_trybot.expected/Release_intel.json
===================================================================
--- scripts/slave/recipes/webrtc_android_apk_trybot.expected/Release_intel.json (revision 248765)
+++ scripts/slave/recipes/webrtc_android_apk_trybot.expected/Release_intel.json (working copy)
@@ -107,7 +107,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -135,13 +135,15 @@
"ninja",
"--compiler",
"goma",
+ "--goma-dir",
+ "[BUILD]/goma",
"--",
"android_builder_webrtc"
],
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -161,7 +163,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -181,7 +183,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -201,7 +203,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -221,7 +223,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -241,7 +243,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -261,7 +263,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -281,7 +283,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -301,7 +303,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -321,7 +323,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -341,7 +343,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -361,7 +363,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=ia32 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},

Powered by Google App Engine
This is Rietveld 408576698