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

Side by Side Diff: chrome/chrome.gyp

Issue 2008643002: Make chrome.exe/dll GN imports match GYP, remove user32 delay imports. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove more delay load stuff Created 4 years, 7 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
« no previous file with comments | « chrome/app/delay_load_hook_win.cc ('k') | chrome/chrome.user32.delay.imports » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 ], 436 ],
437 }, 437 },
438 }, 438 },
439 }, 439 },
440 ], # 'targets' 440 ], # 'targets'
441 'includes': [ 441 'includes': [
442 'chrome_watcher/chrome_watcher.gypi', 442 'chrome_watcher/chrome_watcher.gypi',
443 'chrome_process_finder.gypi', 443 'chrome_process_finder.gypi',
444 ], 444 ],
445 }], # OS=="win" 445 }], # OS=="win"
446 ['OS=="win" and target_arch=="ia32"',
447 { 'targets': [
448 {
449 'target_name': 'chrome_user32_delay_imports',
450 'type': 'none',
451 'variables': {
452 'lib_dir': '<(INTERMEDIATE_DIR)',
453 },
454 'sources': [
455 'chrome.user32.delay.imports'
456 ],
457 'includes': [
458 '../build/win/importlibs/create_import_lib.gypi',
459 ],
460 'direct_dependent_settings': {
461 'msvs_settings': {
462 'VCLinkerTool': {
463 'AdditionalLibraryDirectories': ['<(lib_dir)', ],
464 'AdditionalDependencies': ['chrome.user32.delay.lib', ],
465 },
466 },
467 },
468 },
469 ]}, # 'targets'
470 ], # OS=="win" and target_arch=="ia32"
471 ['chromeos==1', { 446 ['chromeos==1', {
472 'includes': [ 'chrome_browser_chromeos.gypi' ], 447 'includes': [ 'chrome_browser_chromeos.gypi' ],
473 }], # chromeos==1 448 }], # chromeos==1
474 ['OS=="android"', 449 ['OS=="android"',
475 { 450 {
476 'targets': [ 451 'targets': [
477 { 452 {
478 # GN: //chrome/android:chrome_java 453 # GN: //chrome/android:chrome_java
479 'target_name': 'chrome_java', 454 'target_name': 'chrome_java',
480 'type': 'none', 455 'type': 'none',
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 # expired. crbug.com/577698 730 # expired. crbug.com/577698
756 '../components/components.gyp:startup_metric_utils_common', 731 '../components/components.gyp:startup_metric_utils_common',
757 ], 732 ],
758 }], 733 }],
759 ], 734 ],
760 }, 735 },
761 ], 736 ],
762 }], 737 }],
763 ], # 'conditions' 738 ], # 'conditions'
764 } 739 }
OLDNEW
« no previous file with comments | « chrome/app/delay_load_hook_win.cc ('k') | chrome/chrome.user32.delay.imports » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698