Changeset 204843 in webkit

Timestamp:

Aug 23, 2016, 11:36:44 AM (9 years ago)

Author:

andersca@apple.com

Message:

Add a workaround for iOS Frameworks that expect DOM bindings to be in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=161093

Reviewed by Dan Bernstein.

Create a text-based stub library that looks enough like WebKitLegacy that we can trick the linker
into creating a LC_REEXPORT_DYLIB load command in WebCore.

• Configurations/WebCore.xcconfig:

Link against this WebKitLegacyStub tbd file on iOS 9.0, 9.3 and 10.0.

• Configurations/WebKitLegacyStub.iOS.tbd:

Add new tbd file.

• WebCore.xcodeproj/project.pbxproj:

Add new files.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCore.xcconfig (modified) (1 diff)
• Configurations/WebKitLegacyStub.iOS.tbd (added)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-23  Anders Carlsson  <andersca@apple.com>
+
+        Add a workaround for iOS Frameworks that expect DOM bindings to be in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=161093
+
+        Reviewed by Dan Bernstein.
+
+        Create a text-based stub library that looks enough like WebKitLegacy that we can trick the linker
+        into creating a LC_REEXPORT_DYLIB load command in WebCore.
+
+        * Configurations/WebCore.xcconfig:
+        Link against this WebKitLegacyStub tbd file on iOS 9.0, 9.3 and 10.0.
+
+        * Configurations/WebKitLegacyStub.iOS.tbd:
+        Add new tbd file.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        Add new files.
+
 2016-08-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Configurations/WebCore.xcconfig

@@ -58 +58 @@
 PRODUCT_NAME = WebCore;
 UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp;
+
+WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET = V$(IPHONEOS_DEPLOYMENT_TARGET);
+
+WK_IOS_BINCOMPAT_LDFLAGS = $(WK_IOS_BINCOMPAT_LDFLAGS_$(WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET:identifier));
+WK_IOS_BINCOMPAT_LDFLAGS_V9_0 = -Wl,-reexport_library,$(SRCROOT)/Configurations/WebKitLegacyStub.iOS.tbd;
+WK_IOS_BINCOMPAT_LDFLAGS_V9_3 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_0);
+WK_IOS_BINCOMPAT_LDFLAGS_V10_0 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_3);
+
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM);
 OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
-OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework OpenGLES -lMobileGestalt;
+OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS);
 OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface;
 OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -7778 +7778 @@
                 1AE96A861D1A0CEB00B86768 /* PaymentAuthorizationStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentAuthorizationStatus.h; sourceTree = "<group>"; };
                 1AE96A871D1A0CEB00B86768 /* PaymentMerchantSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentMerchantSession.h; sourceTree = "<group>"; };
+                1AEA88FF1D6CBF5E00E5AD64 /* WebKitLegacyStub.iOS.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; path = WebKitLegacyStub.iOS.tbd; sourceTree = "<group>"; };
                 1AED3BD91D3D5F260099FD78 /* PassKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassKitSPI.h; sourceTree = "<group>"; };
                 1AEF4E66170E160300AB2799 /* CachedFontClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFontClient.h; sourceTree = "<group>"; };
@@ -15460 +15461 @@
                                 E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */,
                                 4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */,
+                                1AEA88FF1D6CBF5E00E5AD64 /* WebKitLegacyStub.iOS.tbd */,
                         );
                         path = Configurations;