[iOS] Update order file paths for WebKit and WebKit2
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jul 2014 01:38:06 +0000 (01:38 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jul 2014 01:38:06 +0000 (01:38 +0000)
<http://webkit.org/b/134993>
<rdar://problem/17557776>

Reviewed by Darin Adler.

Source/WebKit/mac:
* Configurations/Base.xcconfig: Rename WebKit.order to
WebKitLegacy.order.

Source/WebKit2:
* Configurations/Base.xcconfig: Add order file for iOS
named WebKit.order.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/Base.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/Base.xcconfig

index efe8b2dcd2a38cba63548004c20b7b7f52dc5c76..c8cb8a0be8f0d5230fff0f94bf17fee0257c149f 100644 (file)
@@ -1,3 +1,14 @@
+2014-07-16  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Update order file paths for WebKit and WebKit2
+        <http://webkit.org/b/134993>
+        <rdar://problem/17557776>
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Rename WebKit.order to
+        WebKitLegacy.order.
+
 2014-07-16  Brady Eidson  <beidson@apple.com>
 
         Add WebSecurityOrigin "webSecurityOriginFromDatabaseIdentifier" SPI and change _websiteDataURLForContainerWithURL: SPI
index 5578493038ae707c33d44d0abd69e164ca0097bb..35263fffc01ed8bf0340edad2f41c31341f7762a 100644 (file)
@@ -102,7 +102,7 @@ STRIP_INSTALLED_PRODUCT_debug = NO;
 DEAD_CODE_STRIPPING = YES;
 
 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
-SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
+SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
 SECTORDER_FLAGS_macosx = -Wl,-order_file,mac/WebKit.order;
 
 SDKROOT = macosx.internal;
index 8a8f5715f11cf9f6564788feeb6452e169306fe5..e21147100ba32779c4c0133d3dfae745f6356de5 100644 (file)
@@ -1,3 +1,14 @@
+2014-07-16  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Update order file paths for WebKit and WebKit2
+        <http://webkit.org/b/134993>
+        <rdar://problem/17557776>
+
+        Reviewed by Darin Adler.
+
+        * Configurations/Base.xcconfig: Add order file for iOS
+        named WebKit.order.
+
 2014-07-16  Brady Eidson  <beidson@apple.com>
 
         Add WebSecurityOrigin "webSecurityOriginFromDatabaseIdentifier" SPI and change _websiteDataURLForContainerWithURL: SPI
index 86390de8482cc95d6f6062707d270290da4fa17f..12aebe0191db41fe8bdaea3f66e677577465f586 100644 (file)
@@ -99,7 +99,9 @@ COPY_PHASE_STRIP = NO;
 // building the MiG bindings for WebKitPluginClient even when the functions that the bindings wrap are not built.
 DEAD_CODE_STRIPPING = YES;
 
-SECTORDER_FLAGS = -Wl,-order_file,mac/WebKit2.order;
+SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
+SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
+SECTORDER_FLAGS_macosx = -Wl,-order_file,mac/WebKit2.order;
 
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);