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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 1412803002: Switch Chrome to dlopen() the Google Chrome Framework.framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a shim so that Chrome does not link chrome_dll Created 5 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
« chrome/app/chrome_exe_main_mac.c ('K') | « chrome/chrome_dll.gypi ('k') | no next file » | 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 # GN version: //chrome 8 # GN version: //chrome
9 'target_name': 'chrome', 9 'target_name': 'chrome',
10 'type': 'none', 10 'type': 'none',
(...skipping 28 matching lines...) Expand all
39 'message': 'Reordering Imports', 39 'message': 'Reordering Imports',
40 }, 40 },
41 ], 41 ],
42 }], 42 }],
43 ], 43 ],
44 }, 44 },
45 { 45 {
46 # GN version: //chrome:chrome_initial 46 # GN version: //chrome:chrome_initial
47 'target_name': 'chrome_initial', 47 'target_name': 'chrome_initial',
48 'type': 'executable', 48 'type': 'executable',
49 'dependencies' : [ '../chrome/common_constants.gyp:version_header', ],
49 # Name the exe chrome.exe, not chrome_initial.exe. 50 # Name the exe chrome.exe, not chrome_initial.exe.
50 'product_name': 'chrome', 51 'product_name': 'chrome',
51 'mac_bundle': 1, 52 'mac_bundle': 1,
52 'variables': { 53 'variables': {
53 'use_system_xdg_utils%': 0, 54 'use_system_xdg_utils%': 0,
54 'enable_wexit_time_destructors': 1, 55 'enable_wexit_time_destructors': 1,
55 }, 56 },
56 'sources': [ 57 'sources': [
57 # Note that due to InitializeSandboxInfo, this must be directly linked 58 # Note that due to InitializeSandboxInfo, this must be directly linked
58 # into chrome.exe, not into a dependent. 59 # into chrome.exe, not into a dependent.
59 '<(DEPTH)/content/app/sandbox_helper_win.cc', 60 '<(DEPTH)/content/app/sandbox_helper_win.cc',
60 '<(DEPTH)/content/public/common/content_switches.cc', 61 '<(DEPTH)/content/public/common/content_switches.cc',
61 'app/chrome_exe_load_config_win.cc', 62 'app/chrome_exe_load_config_win.cc',
62 'app/chrome_exe_main_aura.cc', 63 'app/chrome_exe_main_aura.cc',
63 'app/chrome_exe_main_mac.cc', 64 'app/chrome_exe_main_mac.c',
64 'app/chrome_exe_main_win.cc', 65 'app/chrome_exe_main_win.cc',
65 'app/chrome_exe_resource.h', 66 'app/chrome_exe_resource.h',
66 'app/chrome_watcher_client_win.cc', 67 'app/chrome_watcher_client_win.cc',
67 'app/chrome_watcher_client_win.h', 68 'app/chrome_watcher_client_win.h',
68 'app/chrome_watcher_command_line_win.cc', 69 'app/chrome_watcher_command_line_win.cc',
69 'app/chrome_watcher_command_line_win.h', 70 'app/chrome_watcher_command_line_win.h',
70 'app/client_util.cc', 71 'app/client_util.cc',
71 'app/client_util.h', 72 'app/client_util.h',
72 'app/kasko_client.cc', 73 'app/kasko_client.cc',
73 'app/kasko_client.h', 74 'app/kasko_client.h',
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', 264 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
264 'CHROMIUM_CREATOR': '<(mac_creator)', 265 'CHROMIUM_CREATOR': '<(mac_creator)',
265 'CHROMIUM_SHORT_NAME': '<(branding)', 266 'CHROMIUM_SHORT_NAME': '<(branding)',
266 }, 267 },
267 'dependencies': [ 268 'dependencies': [
268 '../components/components.gyp:chrome_manifest_bundle', 269 '../components/components.gyp:chrome_manifest_bundle',
269 'helper_app', 270 'helper_app',
270 'infoplist_strings_tool', 271 'infoplist_strings_tool',
271 # On Mac, make sure we've built chrome_dll, which contains all of 272 # On Mac, make sure we've built chrome_dll, which contains all of
272 # the library code with Chromium functionality. 273 # the library code with Chromium functionality.
273 'chrome_dll', 274 'chrome_dll_dependency_shim',
274 ], 275 ],
275 'mac_bundle_resources': [ 276 'mac_bundle_resources': [
276 'app/theme/<(branding_path_component)/mac/app.icns', 277 'app/theme/<(branding_path_component)/mac/app.icns',
277 'app/theme/<(branding_path_component)/mac/document.icns', 278 'app/theme/<(branding_path_component)/mac/document.icns',
278 'browser/ui/cocoa/applescript/scripting.sdef', 279 'browser/ui/cocoa/applescript/scripting.sdef',
279 '<(PRODUCT_DIR)/<(mac_bundle_id).manifest', 280 '<(PRODUCT_DIR)/<(mac_bundle_id).manifest',
280 ], 281 ],
281 'actions': [ 282 'actions': [
282 { 283 {
283 # Generate the InfoPlist.strings file 284 # Generate the InfoPlist.strings file
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 'dependencies': [ 618 'dependencies': [
618 'chrome_nacl_win64', 619 'chrome_nacl_win64',
619 ], 620 ],
620 }], 621 }],
621 ], 622 ],
622 }, 623 },
623 ], 624 ],
624 }], 625 }],
625 ], 626 ],
626 } 627 }
OLDNEW
« chrome/app/chrome_exe_main_mac.c ('K') | « chrome/chrome_dll.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698