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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.intel.32.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-linux.intel.64-to-android.arm.64.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.intel.64.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/Release-linux.intel.64-to-android.intel.32.json
diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.intel.32.json b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.intel.32.json
index f4afbffa05594b15b02ae62d53de6ddb0958ce8f..2be1d0bfb8ff05550d42e1dd7ffccea04f90bbce 100644
--- a/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.intel.32.json
+++ b/scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.intel.32.json
@@ -10,7 +10,7 @@
},
"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_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"
}
@@ -26,7 +26,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "component=static_library",
+ "GYP_DEFINES": "component=static_library target_arch=ia32",
"GYP_GENERATORS": "ninja"
}
},
@@ -41,7 +41,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "clang=1 component=static_library",
+ "GYP_DEFINES": "clang=1 component=static_library target_arch=ia32",
"GYP_GENERATORS": "ninja"
}
},
@@ -57,7 +57,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "component=static_library",
+ "GYP_DEFINES": "component=static_library target_arch=ia32",
"GYP_GENERATORS": "ninja"
}
},
@@ -73,7 +73,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "clang=1 component=static_library",
+ "GYP_DEFINES": "clang=1 component=static_library target_arch=ia32",
"GYP_GENERATORS": "ninja"
}
},
@@ -89,7 +89,7 @@
},
"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_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=ia32",
"GYP_GENERATORS": "ninja",
"GYP_GENERATOR_FLAGS": "default_target=All"
}
@@ -105,28 +105,12 @@
},
"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": "Release",
- "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_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"
}
},
+ "component_builder": "config \"component_builder\" includes \"main_builder\", but [Cannot target arm with TARGET_ARCH == intel]",
"dartium_builder": {
"build_config_fs": "Release",
"build_dir": "Path('[CHECKOUT]', 'out')",
@@ -156,45 +140,13 @@
},
"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": "Release",
- "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": "Release",
- "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_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"
}
},
+ "klp_builder": "config \"klp_builder\" includes \"main_builder\", but [Cannot target arm with TARGET_ARCH == intel]",
+ "main_builder": "Cannot target arm with TARGET_ARCH == intel",
"main_tests": {
"build_config_fs": "Release",
"build_dir": "Path('[CHECKOUT]', 'out')",
@@ -206,7 +158,7 @@
},
"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_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"
}
@@ -219,7 +171,7 @@
"build_tool": "ninja"
},
"gyp_env": {
- "GYP_DEFINES": "component=static_library",
+ "GYP_DEFINES": "component=static_library target_arch=ia32",
"GYP_GENERATORS": "ninja"
}
},
@@ -234,28 +186,12 @@
},
"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": "Release",
- "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_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"
}
},
+ "try_builder": "config \"try_builder\" includes \"main_builder\", but [Cannot target arm with TARGET_ARCH == intel]",
"try_instrumentation_tests": {
"build_config_fs": "Release",
"build_dir": "Path('[CHECKOUT]', 'out')",
@@ -267,7 +203,7 @@
},
"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_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"
}
@@ -282,7 +218,7 @@
]
},
"gyp_env": {
- "GYP_DEFINES": "v8_target_arch=ia32"
+ "GYP_DEFINES": "target_arch=ia32 v8_target_arch=ia32"
}
},
"x86_builder": {
@@ -324,13 +260,14 @@
"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_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"
}
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.arm.64.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Release-linux.intel.64-to-android.intel.64.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698