Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'dependencies': [ | 6 'dependencies': [ |
| 7 '../skia/skia.gyp:skia', | 7 '../skia/skia.gyp:skia', |
| 8 '../third_party/npapi/npapi.gyp:npapi', | 8 '../third_party/npapi/npapi.gyp:npapi', |
| 9 '../webkit/support/webkit_support.gyp:glue', | 9 '../webkit/support/webkit_support.gyp:glue', |
| 10 ], | 10 ], |
| 11 'include_dirs': [ | 11 'include_dirs': [ |
| 12 '<(INTERMEDIATE_DIR)', | 12 '<(INTERMEDIATE_DIR)', |
| 13 ], | 13 ], |
| 14 'sources': [ | 14 'sources': [ |
| 15 # All .cc, .h, .m, and .mm files under plugins except for tests and | 15 # All .cc, .h, .m, and .mm files under plugins except for tests and |
| 16 # mocks. | 16 # mocks. |
| 17 'plugin/content_plugin_client.h', | |
| 18 'plugin/plugin_channel.cc', | 17 'plugin/plugin_channel.cc', |
| 19 'plugin/plugin_channel.h', | 18 'plugin/plugin_channel.h', |
| 19 'plugin/plugin_interpose_util_mac.h', | |
| 20 'plugin/plugin_interpose_util_mac.mm', | 20 'plugin/plugin_interpose_util_mac.mm', |
| 21 'plugin/plugin_interpose_util_mac.h', | |
| 22 'plugin/plugin_main.cc', | 21 'plugin/plugin_main.cc', |
| 23 'plugin/plugin_main_linux.cc', | 22 'plugin/plugin_main_linux.cc', |
| 24 'plugin/plugin_main_mac.mm', | 23 'plugin/plugin_main_mac.mm', |
| 25 'plugin/plugin_thread.cc', | 24 'plugin/plugin_thread.cc', |
| 26 'plugin/plugin_thread.h', | 25 'plugin/plugin_thread.h', |
| 27 'plugin/webplugin_accelerated_surface_proxy_mac.cc', | 26 'plugin/webplugin_accelerated_surface_proxy_mac.cc', |
| 28 'plugin/webplugin_accelerated_surface_proxy_mac.h', | 27 'plugin/webplugin_accelerated_surface_proxy_mac.h', |
| 29 'plugin/webplugin_delegate_stub.cc', | 28 'plugin/webplugin_delegate_stub.cc', |
| 30 'plugin/webplugin_delegate_stub.h', | 29 'plugin/webplugin_delegate_stub.h', |
| 31 'plugin/webplugin_proxy.cc', | 30 'plugin/webplugin_proxy.cc', |
| 32 'plugin/webplugin_proxy.h', | 31 'plugin/webplugin_proxy.h', |
| 32 'public/plugin/content_plugin_client.h', | |
| 33 ], | 33 ], |
| 34 # These are layered in conditionals in the event other platforms | 34 # These are layered in conditionals in the event other platforms |
| 35 # end up using this module as well. | 35 # end up using this module as well. |
| 36 'conditions': [ | 36 'conditions': [ |
| 37 ['OS=="win"', { | 37 ['OS=="win"', { |
| 38 'include_dirs': [ | 38 'include_dirs': [ |
| 39 '<(DEPTH)/third_party/wtl/include', | 39 '<(DEPTH)/third_party/wtl/include', |
| 40 ], | 40 ], |
| 41 }], | 41 }], |
| 42 ['toolkit_uses_gtk == 1', { | 42 ['toolkit_uses_gtk == 1', { |
| 43 'dependencies': [ | 43 'dependencies': [ |
| 44 '../build/linux/system.gyp:gtk', | 44 '../build/linux/system.gyp:gtk', |
| 45 ], | 45 ], |
| 46 'link_settings': { | 46 'link_settings': { |
| 47 'libraries': [ | 47 'libraries': [ |
| 48 '-lXext', | 48 '-lXext', |
| 49 ], | 49 ], |
| 50 }, | 50 }, |
| 51 }], | 51 }], |
| 52 ['OS=="mac"', { | |
| 53 'targets': [ | |
| 54 { | |
| 55 # dylib for interposing Carbon calls in the plugin process. | |
| 56 'target_name': 'plugin_carbon_interpose', | |
| 57 'type': 'shared_library', | |
| 58 'dependencies': [ | |
| 59 'chrome_dll', | |
|
jam
2011/10/11 02:08:39
it's a layering violation that a module in content
Avi (use Gerrit)
2011/10/11 15:58:22
As I mentioned, you should bring the carbon interp
Mark Mentovai
2011/10/11 18:26:02
Avi wrote:
| |
| 60 ], | |
| 61 'sources': [ | |
| 62 'plugin/plugin_carbon_interpose_mac.cc', | |
| 63 ], | |
| 64 'include_dirs': [ | |
| 65 '..', | |
| 66 ], | |
| 67 'link_settings': { | |
| 68 'libraries': [ | |
| 69 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', | |
| 70 ], | |
| 71 }, | |
| 72 'xcode_settings': { | |
| 73 'DYLIB_COMPATIBILITY_VERSION': '<(version_mac_dylib)', | |
| 74 'DYLIB_CURRENT_VERSION': '<(version_mac_dylib)', | |
| 75 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..', | |
| 76 }, | |
| 77 'postbuilds': [ | |
| 78 { | |
| 79 # The framework (chrome_dll) defines its load-time path | |
| 80 # (DYLIB_INSTALL_NAME_BASE) relative to the main executable | |
| 81 # (chrome). A different relative path needs to be used in | |
| 82 # plugin_carbon_interpose, which runs in the helper_app. | |
| 83 'postbuild_name': 'Fix Framework Link', | |
| 84 'action': [ | |
| 85 'install_name_tool', | |
| 86 '-change', | |
| 87 '@executable_path/../Versions/<(version_full)/<(mac_product_name ) Framework.framework/<(mac_product_name) Framework', | |
|
jam
2011/10/11 02:08:39
nit: i don't know what this code is, but will this
Mark Mentovai
2011/10/11 18:26:02
John Abd-El-Malek wrote:
| |
| 88 '@executable_path/../../../<(mac_product_name) Framework.framewo rk/<(mac_product_name) Framework', | |
| 89 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}' | |
| 90 ], | |
| 91 }, | |
| 92 ], | |
| 93 }, | |
| 94 ] | |
| 95 }] | |
| 52 ], | 96 ], |
| 53 } | 97 } |
| OLD | NEW |