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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/webrtc_android_apk_trybot.expected/Debug_arm.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
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipes/ozone_ecs.expected/trybot.json ('k') | scripts/slave/recipes/webrtc_android_apk_trybot.expected/Debug_intel.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/webrtc_android_apk_trybot.expected/Debug_arm.json
===================================================================
--- scripts/slave/recipes/webrtc_android_apk_trybot.expected/Debug_arm.json (revision 248765)
+++ scripts/slave/recipes/webrtc_android_apk_trybot.expected/Debug_arm.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=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm 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=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -160,7 +162,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -179,7 +181,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -198,7 +200,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -217,7 +219,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -236,7 +238,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -255,7 +257,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -274,7 +276,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -293,7 +295,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -312,7 +314,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -331,7 +333,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
@@ -350,7 +352,7 @@
"env": {
"FOO": "bar",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=[BUILD]/goma host_os=linux include_tests=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
},
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipes/ozone_ecs.expected/trybot.json ('k') | scripts/slave/recipes/webrtc_android_apk_trybot.expected/Debug_intel.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698