| Index: chrome/chrome.gyp
|
| ===================================================================
|
| --- chrome/chrome.gyp (revision 104808)
|
| +++ chrome/chrome.gyp (working copy)
|
| @@ -1082,7 +1082,7 @@
|
| 'target_name': 'interpose_dependency_shim',
|
| 'type': 'executable',
|
| 'dependencies': [
|
| - 'plugin_carbon_interpose',
|
| + '../content/content.gyp:content_plugin:plugin_carbon_interpose',
|
| ],
|
| # In release, we end up with a strip step that is unhappy if there is
|
| # no binary. Rather than check in a new file for this temporary hack,
|
| @@ -1101,46 +1101,6 @@
|
| ],
|
| },
|
| {
|
| - # dylib for interposing Carbon calls in the plugin process.
|
| - 'target_name': 'plugin_carbon_interpose',
|
| - 'type': 'shared_library',
|
| - 'dependencies': [
|
| - 'chrome_dll',
|
| - ],
|
| - 'sources': [
|
| - 'browser/plugin_carbon_interpose_mac.cc',
|
| - ],
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| - 'link_settings': {
|
| - 'libraries': [
|
| - '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
|
| - ],
|
| - },
|
| - 'xcode_settings': {
|
| - 'DYLIB_COMPATIBILITY_VERSION': '<(version_mac_dylib)',
|
| - 'DYLIB_CURRENT_VERSION': '<(version_mac_dylib)',
|
| - 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..',
|
| - },
|
| - 'postbuilds': [
|
| - {
|
| - # The framework (chrome_dll) defines its load-time path
|
| - # (DYLIB_INSTALL_NAME_BASE) relative to the main executable
|
| - # (chrome). A different relative path needs to be used in
|
| - # plugin_carbon_interpose, which runs in the helper_app.
|
| - 'postbuild_name': 'Fix Framework Link',
|
| - 'action': [
|
| - 'install_name_tool',
|
| - '-change',
|
| - '@executable_path/../Versions/<(version_full)/<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
|
| - '@executable_path/../../../<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
|
| - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
|
| - ],
|
| - },
|
| - ],
|
| - },
|
| - {
|
| 'target_name': 'infoplist_strings_tool',
|
| 'type': 'executable',
|
| 'dependencies': [
|
|
|