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

Side by Side Diff: chrome/chrome.gyp

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
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 'browser/apps/app_shim/browser_app_shim.gypi', 147 'browser/apps/app_shim/browser_app_shim.gypi',
148 ], 148 ],
149 'targets': [ 149 'targets': [
150 { 150 {
151 'target_name': 'helper_app', 151 'target_name': 'helper_app',
152 'type': 'executable', 152 'type': 'executable',
153 'variables': { 'enable_wexit_time_destructors': 1, }, 153 'variables': { 'enable_wexit_time_destructors': 1, },
154 'product_name': '<(mac_product_name) Helper', 154 'product_name': '<(mac_product_name) Helper',
155 'mac_bundle': 1, 155 'mac_bundle': 1,
156 'dependencies': [ 156 'dependencies': [
157 'chrome_dll', 157 'chrome_dll_dependency_shim',
158 'infoplist_strings_tool', 158 'infoplist_strings_tool',
159 'common_constants.gyp:version_header',
160 ],
161 'defines': [
162 'HELPER_EXECUTABLE'
159 ], 163 ],
160 'sources': [ 164 'sources': [
161 # chrome_exe_main_mac.cc's main() is the entry point for 165 # chrome_exe_main_mac.c's main() is the entry point for
162 # the "chrome" (browser app) target. All it does is jump 166 # the "chrome" (browser app) target. All it does is jump
163 # to chrome_dll's ChromeMain. This is appropriate for 167 # to chrome_dll's ChromeMain. This is appropriate for
164 # helper processes too, because the logic to discriminate 168 # helper processes too, because the logic to discriminate
165 # between process types at run time is actually directed 169 # between process types at run time is actually directed
166 # by the --type command line argument processed by 170 # by the --type command line argument processed by
167 # ChromeMain. Sharing chrome_exe_main_mac.cc with the 171 # ChromeMain. Sharing chrome_exe_main_mac.c with the
168 # browser app will suffice for now. 172 # browser app will suffice for now.
169 'app/chrome_exe_main_mac.cc', 173 'app/chrome_exe_main_mac.c',
170 'app/helper-Info.plist', 174 'app/helper-Info.plist',
171 ], 175 ],
172 # TODO(mark): Come up with a fancier way to do this. It should only 176 # TODO(mark): Come up with a fancier way to do this. It should only
173 # be necessary to list helper-Info.plist once, not the three times it 177 # be necessary to list helper-Info.plist once, not the three times it
174 # is listed here. 178 # is listed here.
175 'mac_bundle_resources!': [ 179 'mac_bundle_resources!': [
176 'app/helper-Info.plist', 180 'app/helper-Info.plist',
177 ], 181 ],
178 # TODO(mark): For now, don't put any resources into this app. Its 182 # TODO(mark): For now, don't put any resources into this app. Its
179 # resources directory will be a symbolic link to the browser app's 183 # resources directory will be a symbolic link to the browser app's
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 '<(DEPTH)/third_party/kasko' 797 '<(DEPTH)/third_party/kasko'
794 ], 798 ],
795 }, 799 },
796 }, 800 },
797 }, 801 },
798 }, 802 },
799 ], 803 ],
800 }], 804 }],
801 ], # 'conditions' 805 ], # 'conditions'
802 } 806 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698