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

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: git cl format Created 6 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 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 '../third_party/WebKit/public/all.gyp:all_blink', 328 '../third_party/WebKit/public/all.gyp:all_blink',
329 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 329 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
330 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts', 330 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts',
331 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_ unittests', 331 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_ unittests',
332 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 332 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
333 '../tools/telemetry/telemetry.gyp:*', 333 '../tools/telemetry/telemetry.gyp:*',
334 ], 334 ],
335 }], 335 }],
336 ['OS=="win"', { 336 ['OS=="win"', {
337 'dependencies': [ 337 'dependencies': [
338 '../chrome/chrome.gyp:app_installer',
338 '../chrome/chrome.gyp:crash_service', 339 '../chrome/chrome.gyp:crash_service',
339 '../chrome/chrome.gyp:installer_util_unittests', 340 '../chrome/chrome.gyp:installer_util_unittests',
340 # ../chrome/test/mini_installer requires mini_installer. 341 # ../chrome/test/mini_installer requires mini_installer.
341 '../chrome/installer/mini_installer.gyp:mini_installer', 342 '../chrome/installer/mini_installer.gyp:mini_installer',
342 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', 343 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests',
343 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', 344 '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin',
344 '../courgette/courgette.gyp:courgette_unittests', 345 '../courgette/courgette.gyp:courgette_unittests',
345 '../sandbox/sandbox.gyp:sbox_integration_tests', 346 '../sandbox/sandbox.gyp:sbox_integration_tests',
346 '../sandbox/sandbox.gyp:sbox_unittests', 347 '../sandbox/sandbox.gyp:sbox_unittests',
347 '../sandbox/sandbox.gyp:sbox_validation_tests', 348 '../sandbox/sandbox.gyp:sbox_validation_tests',
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 }, 1153 },
1153 ], # targets 1154 ], # targets
1154 'conditions': [ 1155 'conditions': [
1155 ['branding=="Chrome"', { 1156 ['branding=="Chrome"', {
1156 'targets': [ 1157 'targets': [
1157 { 1158 {
1158 'target_name': 'chrome_official_builder', 1159 'target_name': 'chrome_official_builder',
1159 'type': 'none', 1160 'type': 'none',
1160 'dependencies': [ 1161 'dependencies': [
1161 '../base/base.gyp:base_unittests', 1162 '../base/base.gyp:base_unittests',
1163 # TODO(jackhou): Ensure that app_installer builds on trybots
1164 # and waterfall, then de-comment here.
1165 #'../chrome/chrome.gyp:app_installer',
1162 '../chrome/chrome.gyp:browser_tests', 1166 '../chrome/chrome.gyp:browser_tests',
1163 '../chrome/chrome.gyp:sync_integration_tests', 1167 '../chrome/chrome.gyp:sync_integration_tests',
1164 '../chrome/chrome.gyp:crash_service', 1168 '../chrome/chrome.gyp:crash_service',
1165 '../chrome/chrome.gyp:gcapi_dll', 1169 '../chrome/chrome.gyp:gcapi_dll',
1166 '../chrome/chrome.gyp:pack_policy_templates', 1170 '../chrome/chrome.gyp:pack_policy_templates',
1167 '../chrome/installer/mini_installer.gyp:mini_installer', 1171 '../chrome/installer/mini_installer.gyp:mini_installer',
1168 '../cloud_print/cloud_print.gyp:cloud_print', 1172 '../cloud_print/cloud_print.gyp:cloud_print',
1169 '../courgette/courgette.gyp:courgette', 1173 '../courgette/courgette.gyp:courgette',
1170 '../courgette/courgette.gyp:courgette64', 1174 '../courgette/courgette.gyp:courgette64',
1171 '../ipc/ipc.gyp:ipc_tests', 1175 '../ipc/ipc.gyp:ipc_tests',
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 'dependencies': [ 1334 'dependencies': [
1331 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1335 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1332 '../ui/views/views.gyp:views', 1336 '../ui/views/views.gyp:views',
1333 '../ui/views/views.gyp:views_unittests', 1337 '../ui/views/views.gyp:views_unittests',
1334 ], 1338 ],
1335 }, # target_name: macviews_builder 1339 }, # target_name: macviews_builder
1336 ], # targets 1340 ], # targets
1337 }], # os=='mac' and toolkit_views==1 1341 }], # os=='mac' and toolkit_views==1
1338 ], # conditions 1342 ], # conditions
1339 } 1343 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698