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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json

Issue 59233015: Make gyp target_arch setting native to chromium/config.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase again Created 7 years, 1 month 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/Release-win.intel.64-to-win.intel.32.json ('k') | scripts/slave/recipe_modules/chromium_android/api.py » ('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/Release-win.intel.64-to-win.intel.64.json
diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json b/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json
index 2c940b6645ef8b454aaac8bcb72c3d88dbbf7a18..c499ad5d5aa1dcee89b5a0d8d7500ec366b217d0 100644
--- a/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json
+++ b/scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.64.json
@@ -1,21 +1,5 @@
{
- "android_defaults": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
+ "android_defaults": "Can only build android on linux.",
"blink": {
"build_config_fs": "Release_x64",
"build_dir": "Path('[CHECKOUT]', 'out')",
@@ -82,148 +66,14 @@
"GYP_MSVS_VERSION": "2012"
}
},
- "clang_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma-clang",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "clang_tests": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "component_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "dartium_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "chrome_apk",
- "content_shell_apk"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "enormous_tests": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "klp_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "All"
- ]
- },
- "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 chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "main_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "main_tests": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
+ "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
+ "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
+ "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
+ "dartium_builder": "config \"dartium_builder\" includes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
+ "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
+ "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
+ "main_builder": "config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
+ "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
"msvs": {
"build_config_fs": "Release_x64",
"build_dir": "Path('[CHECKOUT]', 'build')",
@@ -249,58 +99,9 @@
"GYP_MSVS_VERSION": "2012"
}
},
- "tests_base": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "try_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "try_instrumentation_tests": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
+ "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]",
+ "try_builder": "config \"try_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
+ "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Can only build android on linux.]]",
"v8": {
"build_config_fs": "Release",
"build_dir": "Path('[CHECKOUT]')",
@@ -315,58 +116,8 @@
"GYP_MSVS_VERSION": "2012"
}
},
- "x86_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "x86_try_builder": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android chromium_win_pch=0 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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
- "x86_try_instrumentation_tests": {
- "build_config_fs": "Release_x64",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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",
- "GYP_MSVS_VERSION": "2012"
- }
- },
+ "x86_builder": "config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]",
+ "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
+ "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" includes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\", but [Can only build android on linux.]]",
"xcodebuild": "can not use xcodebuild on \"win\""
}
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Release-win.intel.64-to-win.intel.32.json ('k') | scripts/slave/recipe_modules/chromium_android/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698