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

Unified Diff: chrome/chrome.gyp

Issue 28289: Link applications with -Wl,-ObjC to keep Objective-C implementations availabl... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 side-by-side diff with in-line comments
Download patch
« build/mac/make_ib_classes.py ('K') | « build/mac/make_ib_classes.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 10642)
+++ chrome/chrome.gyp (working copy)
@@ -1310,25 +1310,7 @@
'browser',
'renderer',
],
- 'variables': {
- 'conditions': [
- ['OS=="mac"', {
- 'mac_xib_files': [
- # Use .xib files only, because .nibs are bundles and these files
- # need to be used as an input to rules. Rule dependency checking
- # only works on files, not directories as .nib bundles are.
- 'app/nibs/English.lproj/BrowserWindow.xib',
- 'app/nibs/English.lproj/MainMenu.xib',
- 'app/nibs/English.lproj/TabContents.xib',
- ],
- }, { # else: OS!="mac"
- 'mac_xib_files': [],
- }],
- ],
- },
'sources': [
- '<@(mac_xib_files)',
-
# All .cc, .h, and .mm files under app except for tests.
'app/breakpad.cc',
'app/breakpad.h',
@@ -1346,7 +1328,9 @@
'app/scoped_ole_initializer.h',
],
'mac_bundle_resources': [
- '<@(mac_xib_files)',
+ 'app/nibs/English.lproj/BrowserWindow.xib',
+ 'app/nibs/English.lproj/MainMenu.xib',
+ 'app/nibs/English.lproj/TabContents.xib',
'app/theme/chromium/chromium.icns',
'app/theme/back.pdf',
'app/theme/forward.pdf',
@@ -1372,20 +1356,6 @@
'conditions': [
['OS=="mac"', {
'product_name': 'Chromium',
- 'rules': [
- {
- 'rule_name': 'ib_classes',
- 'extension': 'xib',
- 'outputs': [
- '<(INTERMEDIATE_DIR)/ib_classes/<(RULE_INPUT_ROOT)IBClasses.mm',
- ],
- 'inputs': [
- '../build/mac/make_ib_classes.py',
- ],
- 'action': ['python', '<@(_inputs)', '<@(_outputs)', '<(RULE_INPUT_PATH)'],
- 'process_outputs_as_sources': 1,
- },
- ],
}],
['OS!="win"', {
'variables': {
« build/mac/make_ib_classes.py ('K') | « build/mac/make_ib_classes.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698