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

Side by Side Diff: content/content.gyp

Issue 12295040: Stop delay loading user32.dll from chrome.dll on x86/Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build config sketch, mostly works for x86 and x64. Move the hook back to base." Created 7 years, 9 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 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 12 matching lines...) Expand all
23 ], 23 ],
24 }], 24 }],
25 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. 25 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
26 ['OS=="win" and target_arch=="x64"', { 26 ['OS=="win" and target_arch=="x64"', {
27 'msvs_settings': { 27 'msvs_settings': {
28 'VCCLCompilerTool': { 28 'VCCLCompilerTool': {
29 'AdditionalOptions': ['/bigobj'], 29 'AdditionalOptions': ['/bigobj'],
30 }, 30 },
31 }, 31 },
32 }], 32 }],
33 33
34 ], 34 ],
35 }, 35 },
36 'conditions': [ 36 'conditions': [
37 ['inside_chromium_build==1', { 37 ['inside_chromium_build==1', {
38 'includes': [ 38 'includes': [
39 'content_tests.gypi', 39 'content_tests.gypi',
40 ], 40 ],
41 }], 41 }],
42 ['OS != "ios"', { 42 ['OS != "ios"', {
43 'targets': [
44 {
45 'target_name': 'content_user32_delay_imports',
46 'type': 'none',
47 'sources': [
48 'user32.delay.imports',
49 ],
50 'actions': [
51 {
52 'inputs': [
53 '<(DEPTH)/build/win/importlibs/create_importlib_win.py',
54 '<@(_sources)',
55 ],
56 'outputs': [
57 '<(PRODUCT_DIR)/lib/content.user32.delay.imports.lib'
58 ],
59 'action_name': 'build_content_user32_imports',
60 'action': [
61 'python',
62 '<(DEPTH)/build/win/importlibs/create_importlib_win.py',
63 '--verbose',
64 '--output-dir', '<(PRODUCT_DIR)/lib',
65 '<@(_sources)',
66 ],
67 },
68 ],
69 'link_settings': {
70 'msvs_settings': {
71 'VCLinkerTool': {
72 'AdditionalDependencies': [
73 '<(PRODUCT_DIR)/lib/content.user32.delay.imports.lib'
74 ],
75 },
76 },
77 },
78 },
79 ],
43 'includes': [ 80 'includes': [
44 '../build/win_precompile.gypi', 81 '../build/win_precompile.gypi',
45 'content_shell.gypi', 82 'content_shell.gypi',
46 ], 83 ],
47 }], 84 }],
48 # In component mode, we build all of content as a single DLL. 85 # In component mode, we build all of content as a single DLL.
49 # However, in the static mode, we need to build content as multiple 86 # However, in the static mode, we need to build content as multiple
50 # targets in order to prevent dependencies from getting introduced 87 # targets in order to prevent dependencies from getting introduced
51 # upstream unnecessarily (e.g., content_renderer depends on allocator 88 # upstream unnecessarily (e.g., content_renderer depends on allocator
52 # and chrome_exe depends on content_common but we don't want 89 # and chrome_exe depends on content_common but we don't want
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 'include_dirs': [ 422 'include_dirs': [
386 '<(SHARED_INTERMEDIATE_DIR)/content', 423 '<(SHARED_INTERMEDIATE_DIR)/content',
387 ], 424 ],
388 }, 425 },
389 'includes': [ 'content_jni.gypi' ], 426 'includes': [ 'content_jni.gypi' ],
390 }, 427 },
391 ], 428 ],
392 }], # OS == "android" 429 }], # OS == "android"
393 ], 430 ],
394 } 431 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698