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

Side by Side Diff: build/all.gyp

Issue 423293004: Move app_installer into chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 6 years, 3 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 }], 172 }],
173 ['OS=="win"', { 173 ['OS=="win"', {
174 'conditions': [ 174 'conditions': [
175 ['win_use_allocator_shim==1', { 175 ['win_use_allocator_shim==1', {
176 'dependencies': [ 176 'dependencies': [
177 '../base/allocator/allocator.gyp:*', 177 '../base/allocator/allocator.gyp:*',
178 ], 178 ],
179 }], 179 }],
180 ], 180 ],
181 'dependencies': [ 181 'dependencies': [
182 '../app_installer/app_installer.gyp:*',
182 '../chrome_elf/chrome_elf.gyp:*', 183 '../chrome_elf/chrome_elf.gyp:*',
183 '../cloud_print/cloud_print.gyp:*', 184 '../cloud_print/cloud_print.gyp:*',
184 '../courgette/courgette.gyp:*', 185 '../courgette/courgette.gyp:*',
185 '../rlz/rlz.gyp:*', 186 '../rlz/rlz.gyp:*',
186 '../sandbox/sandbox.gyp:*', 187 '../sandbox/sandbox.gyp:*',
187 '<(angle_path)/src/build_angle.gyp:*', 188 '<(angle_path)/src/build_angle.gyp:*',
188 '../third_party/bspatch/bspatch.gyp:*', 189 '../third_party/bspatch/bspatch.gyp:*',
189 '../tools/win/static_initializers/static_initializers.gyp:*', 190 '../tools/win/static_initializers/static_initializers.gyp:*',
190 ], 191 ],
191 }, { 192 }, {
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 '../third_party/WebKit/public/all.gyp:all_blink', 309 '../third_party/WebKit/public/all.gyp:all_blink',
309 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 310 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
310 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts', 311 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts',
311 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_ unittests', 312 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_ unittests',
312 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 313 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
313 '../tools/telemetry/telemetry.gyp:*', 314 '../tools/telemetry/telemetry.gyp:*',
314 ], 315 ],
315 }], 316 }],
316 ['OS=="win"', { 317 ['OS=="win"', {
317 'dependencies': [ 318 'dependencies': [
319 '../app_installer/app_installer.gyp:app_installer',
318 '../chrome/chrome.gyp:crash_service', 320 '../chrome/chrome.gyp:crash_service',
319 '../chrome/chrome.gyp:installer_util_unittests', 321 '../chrome/chrome.gyp:installer_util_unittests',
320 # ../chrome/test/mini_installer requires mini_installer. 322 # ../chrome/test/mini_installer requires mini_installer.
321 '../chrome/installer/mini_installer.gyp:mini_installer', 323 '../chrome/installer/mini_installer.gyp:mini_installer',
322 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', 324 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests',
323 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', 325 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin',
324 '../courgette/courgette.gyp:courgette_unittests', 326 '../courgette/courgette.gyp:courgette_unittests',
325 '../sandbox/sandbox.gyp:sbox_integration_tests', 327 '../sandbox/sandbox.gyp:sbox_integration_tests',
326 '../sandbox/sandbox.gyp:sbox_unittests', 328 '../sandbox/sandbox.gyp:sbox_unittests',
327 '../sandbox/sandbox.gyp:sbox_validation_tests', 329 '../sandbox/sandbox.gyp:sbox_validation_tests',
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 ], 1119 ],
1118 }, 1120 },
1119 ], # targets 1121 ], # targets
1120 'conditions': [ 1122 'conditions': [
1121 ['branding=="Chrome"', { 1123 ['branding=="Chrome"', {
1122 'targets': [ 1124 'targets': [
1123 { 1125 {
1124 'target_name': 'chrome_official_builder', 1126 'target_name': 'chrome_official_builder',
1125 'type': 'none', 1127 'type': 'none',
1126 'dependencies': [ 1128 'dependencies': [
1129 '../app_installer/app_installer.gyp:app_installer',
1127 '../base/base.gyp:base_unittests', 1130 '../base/base.gyp:base_unittests',
1128 '../chrome/chrome.gyp:browser_tests', 1131 '../chrome/chrome.gyp:browser_tests',
1129 '../chrome/chrome.gyp:crash_service', 1132 '../chrome/chrome.gyp:crash_service',
1130 '../chrome/chrome.gyp:gcapi_dll', 1133 '../chrome/chrome.gyp:gcapi_dll',
1131 '../chrome/chrome.gyp:pack_policy_templates', 1134 '../chrome/chrome.gyp:pack_policy_templates',
1132 '../chrome/installer/mini_installer.gyp:mini_installer', 1135 '../chrome/installer/mini_installer.gyp:mini_installer',
1133 '../cloud_print/cloud_print.gyp:cloud_print', 1136 '../cloud_print/cloud_print.gyp:cloud_print',
1134 '../courgette/courgette.gyp:courgette', 1137 '../courgette/courgette.gyp:courgette',
1135 '../courgette/courgette.gyp:courgette64', 1138 '../courgette/courgette.gyp:courgette64',
1136 '../ipc/ipc.gyp:ipc_tests', 1139 '../ipc/ipc.gyp:ipc_tests',
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 'dependencies': [ 1292 'dependencies': [
1290 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1293 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1291 '../ui/views/views.gyp:views', 1294 '../ui/views/views.gyp:views',
1292 '../ui/views/views.gyp:views_unittests', 1295 '../ui/views/views.gyp:views_unittests',
1293 ], 1296 ],
1294 }, # target_name: macviews_builder 1297 }, # target_name: macviews_builder
1295 ], # targets 1298 ], # targets
1296 }], # os=='mac' and toolkit_views==1 1299 }], # os=='mac' and toolkit_views==1
1297 ], # conditions 1300 ], # conditions
1298 } 1301 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698