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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.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/Debug-linux.intel.64-to-android.mips.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.arm.32.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.mips.64.json
diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.64.json b/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.64.json
index b727bc97265ecb02d9eb81c0bc3d98456e53b506..f3309fc1c832aaef7712e24590b2be8fc4562aab 100644
--- a/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.64.json
+++ b/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.64.json
@@ -1,20 +1,5 @@
{
- "android_defaults": {
- "build_config_fs": "Debug",
- "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"
- }
- },
+ "android_defaults": "Android cannot target 64 bits",
"blink": {
"build_config_fs": "Debug",
"build_dir": "Path('[CHECKOUT]', 'out')",
@@ -26,7 +11,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "component=shared_library",
+ "GYP_DEFINES": "component=shared_library target_arch=mips",
"GYP_GENERATORS": "ninja"
}
},
@@ -41,7 +26,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "clang=1 component=shared_library",
+ "GYP_DEFINES": "clang=1 component=shared_library target_arch=mips",
"GYP_GENERATORS": "ninja"
}
},
@@ -57,7 +42,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "component=shared_library",
+ "GYP_DEFINES": "component=shared_library target_arch=mips",
"GYP_GENERATORS": "ninja"
}
},
@@ -73,144 +58,18 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "clang=1 component=shared_library",
+ "GYP_DEFINES": "clang=1 component=shared_library target_arch=mips",
"GYP_GENERATORS": "ninja"
}
},
- "clang_builder": {
- "build_config_fs": "Debug",
- "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 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"
- }
- },
- "clang_tests": {
- "build_config_fs": "Debug",
- "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"
- }
- },
- "component_builder": {
- "build_config_fs": "Debug",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "default_targets": [
- "All"
- ]
- },
- "gyp_env": {
- "GYP_CROSSCOMPILE": "1",
- "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"
- }
- },
- "dartium_builder": {
- "build_config_fs": "Debug",
- "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 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"
- }
- },
- "enormous_tests": {
- "build_config_fs": "Debug",
- "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"
- }
- },
- "klp_builder": {
- "build_config_fs": "Debug",
- "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 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": "Debug",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "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"
- }
- },
- "main_tests": {
- "build_config_fs": "Debug",
- "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"
- }
- },
+ "clang_builder": "config \"clang_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]",
+ "clang_tests": "config \"clang_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
+ "component_builder": "config \"component_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
+ "dartium_builder": "config \"dartium_builder\" includes \"x86_builder\", but [config \"x86_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
+ "enormous_tests": "config \"enormous_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
+ "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
+ "main_builder": "config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]",
+ "main_tests": "config \"main_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
"msvs": "can not use msvs on \"linux\"",
"ninja": {
"build_config_fs": "Debug",
@@ -219,59 +78,13 @@
"build_tool": "ninja"
},
"gyp_env": {
- "GYP_DEFINES": "component=shared_library",
+ "GYP_DEFINES": "component=shared_library target_arch=mips",
"GYP_GENERATORS": "ninja"
}
},
- "tests_base": {
- "build_config_fs": "Debug",
- "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"
- }
- },
- "try_builder": {
- "build_config_fs": "Debug",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "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"
- }
- },
- "try_instrumentation_tests": {
- "build_config_fs": "Debug",
- "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"
- }
- },
+ "tests_base": "config \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]",
+ "try_builder": "config \"try_builder\" includes \"main_builder\", but [config \"main_builder\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
+ "try_instrumentation_tests": "config \"try_instrumentation_tests\" includes \"tests_base\", but [config \"tests_base\" includes \"android_defaults\", but [Android cannot target 64 bits]]",
"v8": {
"build_config_fs": "Debug",
"build_dir": "Path('[CHECKOUT]')",
@@ -282,58 +95,11 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "v8_target_arch=mips"
- }
- },
- "x86_builder": {
- "build_config_fs": "Debug",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "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=ia32",
- "GYP_GENERATORS": "ninja",
- "GYP_GENERATOR_FLAGS": "default_target=All"
- }
- },
- "x86_try_builder": {
- "build_config_fs": "Debug",
- "build_dir": "Path('[CHECKOUT]', 'out')",
- "compile_py": {
- "build_tool": "ninja",
- "compiler": "goma",
- "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=ia32",
- "GYP_GENERATORS": "ninja",
- "GYP_GENERATOR_FLAGS": "default_target=All"
- }
- },
- "x86_try_instrumentation_tests": {
- "build_config_fs": "Debug",
- "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_DEFINES": "target_arch=mips v8_target_arch=mips"
}
},
+ "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]]",
"xcodebuild": "can not use xcodebuild on \"linux\""
}
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-android.mips.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.arm.32.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698