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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.arm.32.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.32-to-linux.mips.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.arm.64.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.arm.32.json
===================================================================
--- scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.arm.32.json (revision 248765)
+++ scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.arm.32.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=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -35,11 +36,12 @@
"compiler": "goma",
"default_targets": [
"blink_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "component=shared_library target_arch=arm",
+ "GYP_DEFINES": "component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -52,11 +54,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=arm",
+ "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -70,11 +73,12 @@
"default_targets": [
"All",
"chromium_builder_tests"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "component=shared_library target_arch=arm",
+ "GYP_DEFINES": "component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -88,11 +92,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=arm",
+ "GYP_DEFINES": "asan=1 clang=1 component=shared_library gomadir=Path('[BUILD]', 'goma') lsan=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -106,11 +111,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=arm",
+ "GYP_DEFINES": "chromeos=1 component=shared_library ffmpeg_branding=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -124,11 +130,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=arm",
+ "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=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -142,11 +149,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=arm",
+ "GYP_DEFINES": "chromeos=1 clang=1 component=shared_library ffmpeg_branding=ChromeOS gomadir=Path('[BUILD]', 'goma') proprietary_codecs=1 target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -160,11 +168,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=arm",
+ "GYP_DEFINES": "clang=1 component=shared_library gomadir=Path('[BUILD]', 'goma') target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -179,11 +188,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=arm",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library gomadir=Path('[BUILD]', 'goma') target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -193,11 +203,12 @@
"compile_py": {
"build_tool": "ninja",
"clobber": false,
- "compiler": "goma-clang"
+ "compiler": "goma-clang",
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 host_os=linux target_arch=arm",
+ "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -220,11 +231,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=shared_library fastbuild=1 host_os=linux target_arch=arm",
+ "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -238,11 +250,12 @@
"default_targets": [
"chrome_apk",
"content_shell_apk"
- ]
+ ],
+ "goma_dir": "Path('[BUILD]', 'goma')"
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 host_os=linux target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -265,11 +278,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 android_sdk_root=Path('[CHECKOUT]', 'third_party', 'android_tools_internal', 'sdk') android_sdk_version=4.4 component=static_library fastbuild=1 host_os=linux target_arch=arm",
+ "GYP_DEFINES": "OS=android android_sdk_root=Path('[CHECKOUT]', 'third_party', 'android_tools_internal', 'sdk') android_sdk_version=4.4 component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -279,11 +293,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=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -334,11 +349,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=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Path('[BUILD]', 'goma') host_os=linux target_arch=arm use_goma=1",
"GYP_GENERATORS": "ninja"
}
},
@@ -376,11 +392,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=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir=Path('[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/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-linux.mips.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.arm.64.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698