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

Unified Diff: chrome/chrome_dll.gypi

Issue 11420019: mac: In component builds, put all chrome code in a nonbundle dylib. 25% faster incremental builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index d39ab36356c8d7da39ced452ccfd32d6bd3f3bc8..f24a907d29f72e9e89b44b1721ce871417c09f56 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -12,6 +12,15 @@
'chrome_main_dll',
],
'conditions': [
+ ['OS=="mac" and component=="shared_library"', {
+ 'type': 'shared_library',
+ 'includes': [ 'chrome_dll_bundle.gypi' ],
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
+ '-Wl,-reexport_library,<(PRODUCT_DIR)/libchrome_main_dll.dylib',
+ ],
+ },
+ }], # OS=="mac"
['incremental_chrome_dll==1', {
# Linking to a different directory and then hardlinking back
# to OutDir is a workaround to avoid having the .ilk for
@@ -169,8 +178,13 @@
},
},
}], # OS=="win"
+ ['OS=="mac" and component!="shared_library"', {
+ 'includes': [ 'chrome_dll_bundle.gypi' ],
+ }],
+ ['OS=="mac" and component=="shared_library"', {
+ 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
+ }],
['OS=="mac"', {
- 'includes': [ 'chrome_dll_bundle.gypi' ],
'xcode_settings': {
# Define the order of symbols within the framework. This
# sets -order_file.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698