| Index: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json
|
| diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json
|
| index a9a5b2884147b43c61f12d473aee4339054f39ed..23fa2601ab9c19067a61910077ebc25b59458428 100644
|
| --- a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.32.json
|
| +++ b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-linux.arm.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"
|
| }
|
|
|