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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 24737002: Add Paths as first-class types in configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: 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
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.arm.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.mips.32.json » ('j') | scripts/slave/recipe_modules/chromium_android/config.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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": "Path([CHECKOUT], ('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 },
11 "gyp_env": { 11 "gyp_env": {
12 "GYP_CROSSCOMPILE": "1", 12 "GYP_CROSSCOMPILE": "1",
13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=arm", 13 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'orderfile .out')) target_arch=arm",
14 "GYP_GENERATORS": "ninja", 14 "GYP_GENERATORS": "ninja",
15 "GYP_GENERATOR_FLAGS": "default_target=All" 15 "GYP_GENERATOR_FLAGS": "default_target=All"
16 } 16 }
17 }, 17 },
18 "blink": { 18 "blink": {
19 "build_config_fs": "Debug", 19 "build_config_fs": "Debug",
20 "build_dir": "out", 20 "build_dir": "Path([CHECKOUT], ('out',))",
21 "compile_py": { 21 "compile_py": {
22 "build_tool": "ninja", 22 "build_tool": "ninja",
23 "compiler": "goma", 23 "compiler": "goma",
24 "default_targets": [ 24 "default_targets": [
25 "all_webkit" 25 "all_webkit"
26 ] 26 ]
27 }, 27 },
28 "gyp_env": { 28 "gyp_env": {
29 "GYP_DEFINES": "component=shared_library", 29 "GYP_DEFINES": "component=shared_library",
30 "GYP_GENERATORS": "ninja" 30 "GYP_GENERATORS": "ninja"
31 } 31 }
32 }, 32 },
33 "chromium": { 33 "chromium": {
34 "build_config_fs": "Debug", 34 "build_config_fs": "Debug",
35 "build_dir": "out", 35 "build_dir": "Path([CHECKOUT], ('out',))",
36 "compile_py": { 36 "compile_py": {
37 "build_tool": "ninja", 37 "build_tool": "ninja",
38 "compiler": "goma", 38 "compiler": "goma",
39 "default_targets": [ 39 "default_targets": [
40 "All", 40 "All",
41 "chromium_builder_tests" 41 "chromium_builder_tests"
42 ] 42 ]
43 }, 43 },
44 "gyp_env": { 44 "gyp_env": {
45 "GYP_DEFINES": "component=shared_library", 45 "GYP_DEFINES": "component=shared_library",
46 "GYP_GENERATORS": "ninja" 46 "GYP_GENERATORS": "ninja"
47 } 47 }
48 }, 48 },
49 "clang_builder": { 49 "clang_builder": {
50 "build_config_fs": "Debug", 50 "build_config_fs": "Debug",
51 "build_dir": "out", 51 "build_dir": "Path([CHECKOUT], ('out',))",
52 "compile_py": { 52 "compile_py": {
53 "build_tool": "ninja", 53 "build_tool": "ninja",
54 "compiler": "goma-clang", 54 "compiler": "goma-clang",
55 "default_targets": [ 55 "default_targets": [
56 "All" 56 "All"
57 ] 57 ]
58 }, 58 },
59 "gyp_env": { 59 "gyp_env": {
60 "GYP_CROSSCOMPILE": "1", 60 "GYP_CROSSCOMPILE": "1",
61 "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 gc c_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] ta rget_arch=arm", 61 "GYP_DEFINES": "OS=android clang=1 component=static_library fastbuild=1 gc c_version=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'o rderfile.out')) target_arch=arm",
62 "GYP_GENERATORS": "ninja", 62 "GYP_GENERATORS": "ninja",
63 "GYP_GENERATOR_FLAGS": "default_target=All" 63 "GYP_GENERATOR_FLAGS": "default_target=All"
64 } 64 }
65 }, 65 },
66 "component_builder": { 66 "component_builder": {
67 "build_config_fs": "Debug", 67 "build_config_fs": "Debug",
68 "build_dir": "out", 68 "build_dir": "Path([CHECKOUT], ('out',))",
69 "compile_py": { 69 "compile_py": {
70 "build_tool": "ninja", 70 "build_tool": "ninja",
71 "compiler": "goma", 71 "compiler": "goma",
72 "default_targets": [ 72 "default_targets": [
73 "All" 73 "All"
74 ] 74 ]
75 }, 75 },
76 "gyp_env": { 76 "gyp_env": {
77 "GYP_CROSSCOMPILE": "1", 77 "GYP_CROSSCOMPILE": "1",
78 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=arm", 78 "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'orderfile .out')) target_arch=arm",
79 "GYP_GENERATORS": "ninja", 79 "GYP_GENERATORS": "ninja",
80 "GYP_GENERATOR_FLAGS": "default_target=All" 80 "GYP_GENERATOR_FLAGS": "default_target=All"
81 } 81 }
82 }, 82 },
83 "klp_builder": { 83 "klp_builder": {
84 "build_config_fs": "Debug", 84 "build_config_fs": "Debug",
85 "build_dir": "out", 85 "build_dir": "Path([CHECKOUT], ('out',))",
86 "compile_py": { 86 "compile_py": {
87 "build_tool": "ninja", 87 "build_tool": "ninja",
88 "compiler": "goma", 88 "compiler": "goma",
89 "default_targets": [ 89 "default_targets": [
90 "All" 90 "All"
91 ] 91 ]
92 }, 92 },
93 "gyp_env": { 93 "gyp_env": {
94 "GYP_CROSSCOMPILE": "1", 94 "GYP_CROSSCOMPILE": "1",
95 "GYP_DEFINES": "OS=android android_sdk_root=['third_party', 'android_tools _internal', 'sdk'] android_sdk_version=KeyLimePie component=static_library fastb uild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile .out'] target_arch=arm", 95 "GYP_DEFINES": "OS=android android_sdk_root=Path([CHECKOUT], ('third_party ', 'android_tools_internal', 'sdk')) android_sdk_version=KeyLimePie component=st atic_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path([C HECKOUT], ('orderfiles', 'orderfile.out')) target_arch=arm",
96 "GYP_GENERATORS": "ninja", 96 "GYP_GENERATORS": "ninja",
97 "GYP_GENERATOR_FLAGS": "default_target=All" 97 "GYP_GENERATOR_FLAGS": "default_target=All"
98 } 98 }
99 }, 99 },
100 "main_builder": { 100 "main_builder": {
101 "build_config_fs": "Debug", 101 "build_config_fs": "Debug",
102 "build_dir": "out", 102 "build_dir": "Path([CHECKOUT], ('out',))",
103 "compile_py": { 103 "compile_py": {
104 "build_tool": "ninja", 104 "build_tool": "ninja",
105 "compiler": "goma", 105 "compiler": "goma",
106 "default_targets": [ 106 "default_targets": [
107 "All" 107 "All"
108 ] 108 ]
109 }, 109 },
110 "gyp_env": { 110 "gyp_env": {
111 "GYP_CROSSCOMPILE": "1", 111 "GYP_CROSSCOMPILE": "1",
112 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=arm", 112 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'orderfile .out')) target_arch=arm",
113 "GYP_GENERATORS": "ninja", 113 "GYP_GENERATORS": "ninja",
114 "GYP_GENERATOR_FLAGS": "default_target=All" 114 "GYP_GENERATOR_FLAGS": "default_target=All"
115 } 115 }
116 }, 116 },
117 "msvs": "can not use msvs on \"linux\"", 117 "msvs": "can not use msvs on \"linux\"",
118 "ninja": { 118 "ninja": {
119 "build_config_fs": "Debug", 119 "build_config_fs": "Debug",
120 "build_dir": "out", 120 "build_dir": "Path([CHECKOUT], ('out',))",
121 "compile_py": { 121 "compile_py": {
122 "build_tool": "ninja" 122 "build_tool": "ninja"
123 }, 123 },
124 "gyp_env": { 124 "gyp_env": {
125 "GYP_DEFINES": "component=shared_library", 125 "GYP_DEFINES": "component=shared_library",
126 "GYP_GENERATORS": "ninja" 126 "GYP_GENERATORS": "ninja"
127 } 127 }
128 }, 128 },
129 "try_builder": { 129 "try_builder": {
130 "build_config_fs": "Debug", 130 "build_config_fs": "Debug",
131 "build_dir": "out", 131 "build_dir": "Path([CHECKOUT], ('out',))",
132 "compile_py": { 132 "compile_py": {
133 "build_tool": "ninja", 133 "build_tool": "ninja",
134 "compiler": "goma", 134 "compiler": "goma",
135 "default_targets": [ 135 "default_targets": [
136 "All" 136 "All"
137 ] 137 ]
138 }, 138 },
139 "gyp_env": { 139 "gyp_env": {
140 "GYP_CROSSCOMPILE": "1", 140 "GYP_CROSSCOMPILE": "1",
141 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=arm", 141 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'orderfile .out')) target_arch=arm",
142 "GYP_GENERATORS": "ninja", 142 "GYP_GENERATORS": "ninja",
143 "GYP_GENERATOR_FLAGS": "default_target=All" 143 "GYP_GENERATOR_FLAGS": "default_target=All"
144 } 144 }
145 }, 145 },
146 "v8": { 146 "v8": {
147 "build_config_fs": "Debug", 147 "build_config_fs": "Debug",
148 "build_dir": "", 148 "build_dir": "Path([CHECKOUT], ())",
149 "compile_py": { 149 "compile_py": {
150 "build_tool": "make", 150 "build_tool": "make",
151 "default_targets": [ 151 "default_targets": [
152 "buildbot" 152 "buildbot"
153 ] 153 ]
154 }, 154 },
155 "gyp_env": { 155 "gyp_env": {
156 "GYP_DEFINES": "v8_target_arch=ia32" 156 "GYP_DEFINES": "v8_target_arch=ia32"
157 } 157 }
158 }, 158 },
159 "x86_builder": { 159 "x86_builder": {
160 "build_config_fs": "Debug", 160 "build_config_fs": "Debug",
161 "build_dir": "out", 161 "build_dir": "Path([CHECKOUT], ('out',))",
162 "compile_py": { 162 "compile_py": {
163 "build_tool": "ninja", 163 "build_tool": "ninja",
164 "compiler": "goma", 164 "compiler": "goma",
165 "default_targets": [ 165 "default_targets": [
166 "All" 166 "All"
167 ] 167 ]
168 }, 168 },
169 "gyp_env": { 169 "gyp_env": {
170 "GYP_CROSSCOMPILE": "1", 170 "GYP_CROSSCOMPILE": "1",
171 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=ia32", 171 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'orderfile .out')) target_arch=ia32",
172 "GYP_GENERATORS": "ninja", 172 "GYP_GENERATORS": "ninja",
173 "GYP_GENERATOR_FLAGS": "default_target=All" 173 "GYP_GENERATOR_FLAGS": "default_target=All"
174 } 174 }
175 }, 175 },
176 "x86_try_builder": { 176 "x86_try_builder": {
177 "build_config_fs": "Debug", 177 "build_config_fs": "Debug",
178 "build_dir": "out", 178 "build_dir": "Path([CHECKOUT], ('out',))",
179 "compile_py": { 179 "compile_py": {
180 "build_tool": "ninja", 180 "build_tool": "ninja",
181 "compiler": "goma", 181 "compiler": "goma",
182 "default_targets": [ 182 "default_targets": [
183 "All" 183 "All"
184 ] 184 ]
185 }, 185 },
186 "gyp_env": { 186 "gyp_env": {
187 "GYP_CROSSCOMPILE": "1", 187 "GYP_CROSSCOMPILE": "1",
188 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arc h=ia32", 188 "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_versio n=46 host_os=linux order_text_section=Path([CHECKOUT], ('orderfiles', 'orderfile .out')) target_arch=ia32",
189 "GYP_GENERATORS": "ninja", 189 "GYP_GENERATORS": "ninja",
190 "GYP_GENERATOR_FLAGS": "default_target=All" 190 "GYP_GENERATOR_FLAGS": "default_target=All"
191 } 191 }
192 }, 192 },
193 "xcodebuild": "can not use xcodebuild on \"linux\"" 193 "xcodebuild": "can not use xcodebuild on \"linux\""
194 } 194 }
OLDNEW
« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.arm.32.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.mips.32.json » ('j') | scripts/slave/recipe_modules/chromium_android/config.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698