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

Unified Diff: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.mips.32.json

Issue 24737002: Add Paths as first-class types in configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: license Created 7 years, 3 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/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.mips.32.json
diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.mips.32.json b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.mips.32.json
index ce5a609e48737dbd59b054061978401c8f707669..357dcae2351b0b72afdb5e31d2c56a360fe4d5af 100644
--- a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.mips.32.json
+++ b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.32-to-android.mips.32.json
@@ -1,7 +1,7 @@
{
"android_defaults": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"default_targets": [
@@ -10,14 +10,14 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
},
"blink": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -32,7 +32,7 @@
},
"chromium": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -48,7 +48,7 @@
},
"clang_builder": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma-clang",
@@ -58,14 +58,14 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",
+ "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
},
"component_builder": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -75,14 +75,14 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",
+ "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
},
"klp_builder": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -92,14 +92,14 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android android_sdk_root=['third_party', 'android_tools_internal', 'sdk'] android_sdk_version=KeyLimePie component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",
+ "GYP_DEFINES": "OS=android android_sdk_root=Path('[CHECKOUT]', 'third_party', 'android_tools_internal', 'sdk') android_sdk_version=KeyLimePie component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
},
"main_builder": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -109,7 +109,7 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
@@ -117,7 +117,7 @@
"msvs": "can not use msvs on \"linux\"",
"ninja": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja"
},
@@ -128,7 +128,7 @@
},
"try_builder": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -138,14 +138,14 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
},
"v8": {
"build_config_fs": "Release",
- "build_dir": "",
+ "build_dir": "Path('[CHECKOUT]')",
"compile_py": {
"build_tool": "make",
"default_targets": [
@@ -158,7 +158,7 @@
},
"x86_builder": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -168,14 +168,14 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=ia32",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
},
"x86_try_builder": {
"build_config_fs": "Release",
- "build_dir": "out",
+ "build_dir": "Path('[CHECKOUT]', 'out')",
"compile_py": {
"build_tool": "ninja",
"compiler": "goma",
@@ -185,7 +185,7 @@
},
"gyp_env": {
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=ia32",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=ia32",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}

Powered by Google App Engine
This is Rietveld 408576698