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

Side by Side Diff: scripts/slave/recipe_modules/chromium/config.expected/Debug-win.intel.64-to-win.intel.32.json

Issue 23532085: [chormium_android api] Set KLP and x86 GYP_DEFINES. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Remove a spurious pass Created 7 years, 2 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 { 1 {
2 "android_defaults": { 2 "android_defaults": {
3 "build_config_fs": "Debug", 3 "build_config_fs": "Debug",
4 "build_dir": "out", 4 "build_dir": "out",
5 "compile_py": { 5 "compile_py": {
6 "build_tool": "ninja", 6 "build_tool": "ninja",
7 "default_targets": [ 7 "default_targets": [
8 "All" 8 "All"
9 ] 9 ]
10 }, 10 },
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 "build_dir": "out", 90 "build_dir": "out",
91 "compile_py": { 91 "compile_py": {
92 "build_tool": "ninja", 92 "build_tool": "ninja",
93 "compiler": "goma", 93 "compiler": "goma",
94 "default_targets": [ 94 "default_targets": [
95 "All" 95 "All"
96 ] 96 ]
97 }, 97 },
98 "gyp_env": { 98 "gyp_env": {
99 "GYP_CROSSCOMPILE": "1", 99 "GYP_CROSSCOMPILE": "1",
100 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=shared_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi le.out'] target_arch=arm", 100 "GYP_DEFINES": "OS=android android_sdk_root=['third_party', 'android_tools _internal', 'sdk'] android_sdk_version=KeyLimePie chromium_win_pch=0 component=s hared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orde rfiles', 'orderfile.out'] target_arch=arm",
101 "GYP_GENERATORS": "ninja", 101 "GYP_GENERATORS": "ninja",
102 "GYP_GENERATOR_FLAGS": "default_target=All", 102 "GYP_GENERATOR_FLAGS": "default_target=All",
103 "GYP_MSVS_VERSION": "2010" 103 "GYP_MSVS_VERSION": "2010"
104 } 104 }
105 }, 105 },
106 "main_builder": { 106 "main_builder": {
107 "build_config_fs": "Debug", 107 "build_config_fs": "Debug",
108 "build_dir": "out", 108 "build_dir": "out",
109 "compile_py": { 109 "compile_py": {
110 "build_tool": "ninja", 110 "build_tool": "ninja",
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 "build_dir": "out", 183 "build_dir": "out",
184 "compile_py": { 184 "compile_py": {
185 "build_tool": "ninja", 185 "build_tool": "ninja",
186 "compiler": "goma", 186 "compiler": "goma",
187 "default_targets": [ 187 "default_targets": [
188 "All" 188 "All"
189 ] 189 ]
190 }, 190 },
191 "gyp_env": { 191 "gyp_env": {
192 "GYP_CROSSCOMPILE": "1", 192 "GYP_CROSSCOMPILE": "1",
193 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=shared_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi le.out'] target_arch=arm", 193 "GYP_DEFINES": "OS=android chromium_win_pch=0 component=shared_library fas tbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfi le.out'] target_arch=x86",
194 "GYP_GENERATORS": "ninja", 194 "GYP_GENERATORS": "ninja",
195 "GYP_GENERATOR_FLAGS": "default_target=All", 195 "GYP_GENERATOR_FLAGS": "default_target=All",
196 "GYP_MSVS_VERSION": "2010" 196 "GYP_MSVS_VERSION": "2010"
197 } 197 }
198 }, 198 },
199 "xcodebuild": "can not use xcodebuild on \"win\"" 199 "xcodebuild": "can not use xcodebuild on \"win\""
200 } 200 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698