| Index: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.intel.64.json
|
| diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.intel.64.json b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.intel.64.json
|
| index f8483d8762d72d67fa2caf6f4058401f35b81ecf..ee27652506ddc7797caae852260d9e1b28e23f8e 100644
|
| --- a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.intel.64.json
|
| +++ b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-chromeos.intel.64.json
|
| @@ -1,4 +1,17 @@
|
| {
|
| + "android": {
|
| + "build_config_fs": "Release",
|
| + "build_dir": "Path('[CHECKOUT]', 'out')",
|
| + "compile_py": {
|
| + "build_tool": "ninja",
|
| + "compiler": "goma"
|
| + },
|
| + "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| + "GYP_DEFINES": "OS=chromeos component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=x64",
|
| + "GYP_GENERATORS": "ninja"
|
| + }
|
| + },
|
| "android_defaults": "Android cannot target 64 bits",
|
| "blink": {
|
| "build_config_fs": "Release",
|
| @@ -11,6 +24,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "component=static_library target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -26,6 +40,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "clang=1 component=static_library target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -42,6 +57,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "component=static_library target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -58,6 +74,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "clang=1 component=static_library target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -78,6 +95,7 @@
|
| "build_tool": "ninja"
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "component=static_library target_arch=x64",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -92,9 +110,11 @@
|
| "build_tool": "make"
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "target_arch=x64 v8_target_arch=x64"
|
| }
|
| },
|
| + "webrtc_android_apk_try_builder": "Only \"android\" platform is supported (got: \"chromeos\")",
|
| "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]",
|
| "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
|
| "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" includes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
|
|
|