Changeset 49882 in webkit

Timestamp:

Oct 20, 2009 1:38:29 PM (15 years ago)

Author:

Nate Chapin

Message:

2009-10-20 Mark Mentovai <​mark@chromium.org>

Reviewed by Darin Fisher.

Use a version of libWebKitSystemInterface with global symbols marked
private_extern for Chromium Mac.

​https://bugs.webkit.org/show_bug.cgi?id=30590

• WebCore.gyp/WebCore.gyp:
• WebCore.gyp/mac: Added.
• WebCore.gyp/mac/Empty.cpp: Added.
• WebCore.gyp/mac/adjust_visibility.sh: Added.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (4 diffs)
• WebCore.gyp/mac (added)
• WebCore.gyp/mac/Empty.cpp (added)
• WebCore.gyp/mac/adjust_visibility.sh (added)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-20  Mark Mentovai  <mark@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Use a version of libWebKitSystemInterface with global symbols marked
+        private_extern for Chromium Mac.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30590
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gyp/mac: Added.
+        * WebCore.gyp/mac/Empty.cpp: Added.
+        * WebCore.gyp/mac/adjust_visibility.sh: Added.
+
 2009-10-20  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/WebCore/WebCore.gyp/WebCore.gyp

@@ -45 +45 @@
       'variables': {'chromium_src_dir': '../../../..'},
     }],
-  ],  
+    ['OS == "mac"', {
+      'targets': [
+        {
+          # On the Mac, libWebKitSystemInterface*.a is used to help WebCore
+          # interface with the system.  This library is supplied as a static
+          # library in binary format.  At present, it contains many global
+          # symbols not marked private_extern.  It should be considered an
+          # implementation detail of WebCore, and does not need these symbols
+          # to be exposed so widely.
+          #
+          # This target contains an action that cracks open the existing
+          # static library and rebuilds it with these global symbols
+          # transformed to private_extern.
+          'target_name': 'webkit_system_interface',
+          'type': 'static_library',
+          'variables': {
+            'adjusted_library_path':
+                '<(PRODUCT_DIR)/libWebKitSystemInterfaceLeopardPrivateExtern.a',
+          },
+          'sources': [
+            # An empty source file is needed to convince Xcode to produce
+            # output for this target.  The resulting library won't actually
+            # contain anything.  The library at adjusted_library_path will,
+            # and that library is pushed to dependents of this target below.
+            'mac/Empty.cpp',
+          ],
+          'actions': [
+            {
+              'action_name': 'Adjust Visibility',
+              'inputs': [
+                'mac/adjust_visibility.sh',
+                '../../WebKitLibraries/libWebKitSystemInterfaceLeopard.a',
+              ],
+              'outputs': [
+                '<(adjusted_library_path)',
+              ],
+              'action': [
+                '<@(_inputs)',
+                '<@(_outputs)',
+                '<(INTERMEDIATE_DIR)/adjust_visibility',  # work directory
+              ],
+            },
+          ],  # actions
+          'link_settings': {
+            'libraries': [
+              '<(adjusted_library_path)',
+            ],
+          },  # link_settings
+        },  # target webkit_system_interface
+      ],  # targets
+    }],  # condition OS == "mac"
+  ],  # conditions
 
   'variables': {
@@ -605 +656 @@
         }],
         ['OS=="mac"', {
+          'dependencies': [
+            'webkit_system_interface',
+          ],
           'defines': [
             # Match Safari and Mozilla on Mac x86.
@@ -741 +795 @@
             '../platform/image-decoders/xbm/XBMImageDecoder.h',
           ],
-          'link_settings': {
-            'libraries': [
-              '../../WebKitLibraries/libWebKitSystemInterfaceLeopard.a',
-            ],
-          },
           'direct_dependent_settings': {
             'include_dirs': [
@@ -790 +839 @@
       ],
     },
-  ], # targets
+  ],  # targets
 }