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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.intel.64.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/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.intel.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.32.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.intel.64.json
===================================================================
--- scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.intel.64.json (revision 248765)
+++ scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.intel.64.json (working copy)
@@ -5,11 +5,12 @@
"compile_py": {
"build_tool": "ninja",
"clobber": false,
- "compiler": "goma"
+ "compiler": "goma",
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux target_arch=x64",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -23,11 +24,12 @@
"compiler": "goma",
"default_targets": [
"blink_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "component=shared_library target_arch=x64",
+ "GYP_DEFINES": "component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -40,11 +42,12 @@
"compiler": "goma-clang",
"default_targets": [
"blink_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "clang=1 component=shared_library target_arch=x64",
+ "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -58,11 +61,12 @@
"default_targets": [
"All",
"chromium_builder_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "component=shared_library target_arch=x64",
+ "GYP_DEFINES": "component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -76,11 +80,12 @@
"default_targets": [
"All",
"chromium_builder_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "asan=1 clang=1 component=shared_library lsan=1 target_arch=x64",
+ "GYP_DEFINES": "asan=1 clang=1 component=shared_library gomadir=Path('[BUILD]', 'goma') lsan=1 target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -94,11 +99,12 @@
"default_targets": [
"All",
"chromium_builder_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "chromeos=1 component=shared_library ffmpeg_branding=ChromeOS proprietary_codecs=1 target_arch=x64",
+ "GYP_DEFINES": "chromeos=1 component=shared_library ffmpeg_branding=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -112,11 +118,12 @@
"default_targets": [
"All",
"chromium_builder_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=shared_library ffmpeg_branding=ChromeOS lsan=1 proprietary_codecs=1 target_arch=x64",
+ "GYP_DEFINES": "asan=1 chromeos=1 clang=1 component=shared_library ffmpeg_branding=ChromeOS gomadir=Path('[BUILD]', 'goma') lsan=1 proprietary_codecs=1 target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -130,11 +137,12 @@
"default_targets": [
"All",
"chromium_builder_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_branding=ChromeOS proprietary_codecs=1 target_arch=x64",
+ "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_branding=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -148,11 +156,12 @@
"default_targets": [
"All",
"chromium_builder_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "clang=1 component=shared_library target_arch=x64",
+ "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -167,11 +176,12 @@
"All",
"chromium_builder_tests"
],
+ "goma_dir": "Path('[BUILD]', 'goma')",
"mode": "official"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library target_arch=x64",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library gomadir=Path('[BUILD]', 'goma') target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -222,11 +232,12 @@
"compiler": "goma",
"default_targets": [
"android_builder_webrtc"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux include_tests=1 target_arch=x64",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux include_tests=1 target_arch=x64 use_goma=1",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
}
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.intel.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.32.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698