Add WebKitPrivateFrameworkStubs for iOS 11

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

Reviewed by David Kilzer.

Source/JavaScriptCore:

* Configurations/Base.xcconfig: iphoneos and iphonesimulator should use the
same directory for private framework stubs.

Source/WebCore:

* Configurations/WebCore.xcconfig: iphoneos and iphonesimulator should use the
same directory for private framework stubs.

Source/WebCore/PAL:

* Configurations/PAL.xcconfig: iphoneos and iphonesimulator should use the
same directory for private framework stubs.

Source/WebKit/mac:

* Configurations/WebKitLegacy.xcconfig: iphoneos and iphonesimulator should
use the same directory for private framework stubs.

Source/WebKit2:

* Configurations/BaseTarget.xcconfig: iphoneos and iphonesimulator should use the
same directory for private framework stubs.

Tools:

* DumpRenderTree/mac/Configurations/Base.xcconfig: iphoneos and iphonesimulator
should use the same directory for private framework stubs.
* WebKitTestRunner/Configurations/Base.xcconfig: Ditto.

WebKitLibraries:

* WebKitPrivateFrameworkStubs/iOS/9: Add Mac architecture for Simulator.
* WebKitPrivateFrameworkStubs/iOS/10: Ditto..
* WebKitPrivateFrameworkStubs/iOS/11: Added.

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 0277f36097c87ea31c215a89d00a378a2a9ddc35..7b625d06eceb802ac004ec50848750b139d7a337 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2017-07-05  Jonathan Bedard  <jbedard@apple.com>
+
+        Add WebKitPrivateFrameworkStubs for iOS 11
+        https://bugs.webkit.org/show_bug.cgi?id=173988
+
+        Reviewed by David Kilzer.
+
+        * Configurations/Base.xcconfig: iphoneos and iphonesimulator should use the
+        same directory for private framework stubs.
+
 2017-07-05  JF Bastien  <jfbastien@apple.com>
 
         WebAssembly: implement name section's module name, skip unknown sections

diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig
index 0bc0102bd8365a8e400382f64d6df1f9c9581693..802231fb211b0c5cbda8258070e3f1f8dc8f0def 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Base.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Base.xcconfig
@@ -100,8 +100,8 @@ CODE_SIGN_IDENTITY = -;
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
 
 FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c695a34934efe5d753dde1138da1ceab9bf670c7..693a5f8662c6cc02f1ed51cf52be25e354d5efd2 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2017-07-05  Jonathan Bedard  <jbedard@apple.com>
+
+        Add WebKitPrivateFrameworkStubs for iOS 11
+        https://bugs.webkit.org/show_bug.cgi?id=173988
+
+        Reviewed by David Kilzer.
+
+        * Configurations/WebCore.xcconfig: iphoneos and iphonesimulator should use the
+        same directory for private framework stubs.
+
 2017-07-05  Emilio Cobos Álvarez  <ecobos@igalia.com>
 
         Don't resolve an extra computed style for getComputedStyle in a display: none subtree.

diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
index 6902088ce55bf3cd4d06ca7209476bbcb108b9d2..a25b8856daa67d57c35ba11dd4b6a7ac060f6a0b 100644 (file)
--- a/Source/WebCore/Configurations/WebCore.xcconfig
+++ b/Source/WebCore/Configurations/WebCore.xcconfig
@@ -30,10 +30,9 @@ GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
 WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_NO = $(PRODUCTION_FRAMEWORKS_DIR);
 
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
 FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index 7bf5ce1ba996332cd594dfd8f203f6281e143605..6323f8f5c8e374a13869348b585d15d7ec1d1df6 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,13 @@
+2017-07-05  Jonathan Bedard  <jbedard@apple.com>
+
+        Add WebKitPrivateFrameworkStubs for iOS 11
+        https://bugs.webkit.org/show_bug.cgi?id=173988
+
+        Reviewed by David Kilzer.
+
+        * Configurations/PAL.xcconfig: iphoneos and iphonesimulator should use the
+        same directory for private framework stubs.
+
 2017-07-03  Sam Weinig  <sam@webkit.org>
 
         [WebIDL] Remove more unnecessary uses of the preprocessor in idl files

diff --git a/Source/WebCore/PAL/Configurations/PAL.xcconfig b/Source/WebCore/PAL/Configurations/PAL.xcconfig
index e636e66a963191372fbf1a8a50524fe6744b8b86..08a2e4b3c690d89a98704548f99a032ffa03c9b6 100644 (file)
--- a/Source/WebCore/PAL/Configurations/PAL.xcconfig
+++ b/Source/WebCore/PAL/Configurations/PAL.xcconfig
@@ -29,10 +29,9 @@ GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
 WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_NO = $(PRODUCTION_FRAMEWORKS_DIR);
 
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
 FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 0b973137c6c260c21da86d1f52a2cd6746d4cf1d..6e75a979bfd7cd2f719337cb4aaaad74d0a7f306 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2017-07-05  Jonathan Bedard  <jbedard@apple.com>
+
+        Add WebKitPrivateFrameworkStubs for iOS 11
+        https://bugs.webkit.org/show_bug.cgi?id=173988
+
+        Reviewed by David Kilzer.
+
+        * Configurations/WebKitLegacy.xcconfig: iphoneos and iphonesimulator should
+        use the same directory for private framework stubs.
+
 2017-07-03  Matt Lewis  <jlewis3@apple.com>
 
         Unreviewed, rolling out r219103.

diff --git a/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
index 1501859f72abb1d835efd193477a78f975556fe6..ee526aebd302c1b22c75f7d9c586f672eb905cc8 100644 (file)
--- a/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
+++ b/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
@@ -34,10 +34,9 @@ EXPORTED_SYMBOLS_FILE[sdk=macosx*][arch=x86_64] = $(BUILT_PRODUCTS_DIR)/DerivedS
 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
 WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_NO = $(PRODUCTION_FRAMEWORKS_DIR);
 
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
 FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 1ff712e06c4f6acd857aeb59d072edba4ea60633..0c9c8d325b0b2dd0a4b8fc70c74d55e3ddd8a575 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2017-07-05  Jonathan Bedard  <jbedard@apple.com>
+
+        Add WebKitPrivateFrameworkStubs for iOS 11
+        https://bugs.webkit.org/show_bug.cgi?id=173988
+
+        Reviewed by David Kilzer.
+
+        * Configurations/BaseTarget.xcconfig: iphoneos and iphonesimulator should use the
+        same directory for private framework stubs.
+
 2017-07-05  Andy Estes  <aestes@apple.com>
 
         [iOS] WKActionSheetAssistants can outlive their host views

diff --git a/Source/WebKit2/Configurations/BaseTarget.xcconfig b/Source/WebKit2/Configurations/BaseTarget.xcconfig
index e4b63b8d3ce3b8c05f6a2757679cd6e277a19f6c..5e3b44580331b781bf1e4d51d18f61820f6e9d70 100644 (file)
--- a/Source/WebKit2/Configurations/BaseTarget.xcconfig
+++ b/Source/WebKit2/Configurations/BaseTarget.xcconfig
@@ -27,10 +27,9 @@
 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
 WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphone_NO = $(PRODUCTION_FRAMEWORKS_DIR);
 
 FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)" $(FRAMEWORK_SEARCH_PATHS);
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2d927fbdf26ad56f5a49840156c6ad6cbdf84d56..62460250c26e7e3bc85d0db62cd83daf706fba58 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2017-07-05  Jonathan Bedard  <jbedard@apple.com>
+
+        Add WebKitPrivateFrameworkStubs for iOS 11
+        https://bugs.webkit.org/show_bug.cgi?id=173988
+
+        Reviewed by David Kilzer.
+
+        * DumpRenderTree/mac/Configurations/Base.xcconfig: iphoneos and iphonesimulator
+        should use the same directory for private framework stubs.
+        * WebKitTestRunner/Configurations/Base.xcconfig: Ditto.
+
 2017-07-05  Eric Carlson  <eric.carlson@apple.com>
 
         [MediaStream] Protect request and web view during gUM client callback

diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
index 17cd893211e07aa99486ba625d8dc74f8f6bc62c..04cbf340f391c51e6d6b229cdeba7184238376da 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
@@ -34,8 +34,8 @@ WK_NOT_YES = NO;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
 
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 

diff --git a/Tools/WebKitTestRunner/Configurations/Base.xcconfig b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
index 00eb26dd6cd94e9c76761c3bce46eb83077cf7ac..c956333450807552b132df51d965d3135c15a41a 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/Base.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
@@ -82,8 +82,8 @@ WK_NOT_YES = NO;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
 
 FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index f570d9497b707b369f75c665393a3a3f557e6a75..a893c699514023f3b4fa36fc69c4ea767605c7d6 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2017-07-05  Jonathan Bedard  <jbedard@apple.com>
+
+        Add WebKitPrivateFrameworkStubs for iOS 11
+        https://bugs.webkit.org/show_bug.cgi?id=173988
+
+        Reviewed by David Kilzer.
+
+        * WebKitPrivateFrameworkStubs/iOS/9: Add Mac architecture for Simulator.
+        * WebKitPrivateFrameworkStubs/iOS/10: Ditto..
+        * WebKitPrivateFrameworkStubs/iOS/11: Added.
+
 2017-07-01  Dan Bernstein  <mitz@apple.com>
 
         [iOS] Remove code only needed when building for iOS 9.x

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd
index a083486963d826a45305b83f633f2db6b0e1fdbd..44579874ce31699d3e859b969ce207ad69a28c89 100644 (file)
--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AppSupport.framework/AppSupport.tbd
@@ -3,12 +3,16 @@ archs:
   - armv7
   - armv7s
   - arm64
+  - i386
+  - x86_64
 exports:
   -
     archs:
       - armv7
       - armv7s
       - arm64
+      - i386
+      - x86_64
     symbols:
       - _CPCopyBundleIdentifierFromAuditToken
 install-name: /System/Library/PrivateFrameworks/AppSupport.framework/AppSupport

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AssertionServices.framework/AssertionServices.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AssertionServices.framework/AssertionServices.tbd
index 5d8c4c1fe760bd7ac507215b14ebf4ae01ccd8bd..3deebbbe1e9eb5b473ccb7273efe4c99e93a7235 100644 (file)
--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AssertionServices.framework/AssertionServices.tbd
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/AssertionServices.framework/AssertionServices.tbd
@@ -3,12 +3,16 @@ archs:
   - armv7
   - armv7s
   - arm64
+  - i386
+  - x86_64
 exports:
   -
     archs:
       - armv7
       - armv7s
       - arm64
+      - i386
+      - x86_64
     objc-classes:
       - _BKSApplicationStateMonitor
       - _BKSProcessAssertion

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePDF.framework/CorePDF.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePDF.framework/CorePDF.tbd
index b78f18e06351fb5c54345dd16b370941b6de6fc5..e7e859eb23da972786645e7985bef2c877c0b406 100644 (file)
--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePDF.framework/CorePDF.tbd
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePDF.framework/CorePDF.tbd
@@ -3,12 +3,16 @@ archs:
   - armv7
   - armv7s
   - arm64
+  - i386
+  - x86_64
 exports:
   -
     archs:
       - armv7
       - armv7s
       - arm64
+      - i386
+      - x86_64
     objc-classes:
       - _UIPDFDocument
       - _UIPDFLinkAnnotation

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePrediction.framework/CorePrediction.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePrediction.framework/CorePrediction.tbd
index 31457480f1e6eb83d008013135f2ecba109bafec..df3faaff55cbe95aa66b2573d57b1b06d8a60c8a 100644 (file)
--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePrediction.framework/CorePrediction.tbd
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/CorePrediction.framework/CorePrediction.tbd
@@ -3,16 +3,20 @@ archs:
   - armv7
   - armv7s
   - arm64
+  - i386
+  - x86_64
 exports:
   -
     archs:
       - armv7
       - armv7s
       - arm64
+      - i386
+      - x86_64
     symbols:
       - _svm_load_model
       - _svm_predict_values
-install-name: /System/Library/PrivateFrameworks/CorePrediction.framework
+install-name: /System/Library/PrivateFrameworks/CorePrediction.framework/CorePrediction
 objc-constraint: none
 platform: ios
 ...

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd
index ddc26569a2367cdc636a886cfaed18f4b91f6e1e..ab1c40600ef739ed07970f5fb37b95e78974151c 100644 (file)
--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/GraphicsServices.framework/GraphicsServices.tbd
@@ -3,12 +3,16 @@ archs:
   - armv7
   - armv7s
   - arm64
+  - i386
+  - x86_64
 exports:
   -
     archs:
       - armv7
       - armv7s
       - arm64
+      - i386
+      - x86_64
     symbols:
       - _GSCurrentEventTimestamp
       - _GSFontInitialize

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/IOSurface.framework/IOSurface.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/IOSurface.framework/IOSurface.tbd
index ad51382bf7e793f95bb24e768483cc2686038230..57b9b97bb8adc356747c2bee2b7021526c2dd448 100644 (file)
--- a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/IOSurface.framework/IOSurface.tbd
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/10/IOSurface.framework/IOSurface.tbd
@@ -3,12 +3,16 @@ archs:
   - armv7
   - armv7s
   - arm64
+  - i386
+  - x86_64
 exports:
   -
     archs:
       - armv7
       - armv7s
       - arm64
+      - i386
+      - x86_64
     symbols:
       - _IOSurfaceAcceleratorCreate
       - _IOSurfaceAcceleratorGetRunLoopSource

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd
new file mode 100644 (file)
index 0000000..4457987
--- /dev/null
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AppSupport.framework/AppSupport.tbd
@@ -0,0 +1,21 @@
+--- !tapi-tbd-v2
+archs:
+  - armv7
+  - armv7s
+  - arm64
+  - i386
+  - x86_64
+exports:
+  -
+    archs:
+      - armv7
+      - armv7s
+      - arm64
+      - i386
+      - x86_64
+    symbols:
+      - _CPCopyBundleIdentifierFromAuditToken
+install-name: /System/Library/PrivateFrameworks/AppSupport.framework/AppSupport
+objc-constraint: none
+platform: ios
+...

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AssertionServices.framework/AssertionServices.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AssertionServices.framework/AssertionServices.tbd
new file mode 100644 (file)
index 0000000..3deebbb
--- /dev/null
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/AssertionServices.framework/AssertionServices.tbd
@@ -0,0 +1,25 @@
+--- !tapi-tbd-v2
+archs:
+  - armv7
+  - armv7s
+  - arm64
+  - i386
+  - x86_64
+exports:
+  -
+    archs:
+      - armv7
+      - armv7s
+      - arm64
+      - i386
+      - x86_64
+    objc-classes:
+      - _BKSApplicationStateMonitor
+      - _BKSProcessAssertion
+    symbols:
+      - _BKSApplicationStateMostElevatedStateForProcessIDKey
+      - _BKSApplicationStateProcessIDKey
+install-name: /System/Library/PrivateFrameworks/AssertionServices.framework/AssertionServices
+objc-constraint: none
+platform: ios
+...

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/CorePDF.framework/CorePDF.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/CorePDF.framework/CorePDF.tbd
new file mode 100644 (file)
index 0000000..e7e859e
--- /dev/null
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/CorePDF.framework/CorePDF.tbd
@@ -0,0 +1,24 @@
+--- !tapi-tbd-v2
+archs:
+  - armv7
+  - armv7s
+  - arm64
+  - i386
+  - x86_64
+exports:
+  -
+    archs:
+      - armv7
+      - armv7s
+      - arm64
+      - i386
+      - x86_64
+    objc-classes:
+      - _UIPDFDocument
+      - _UIPDFLinkAnnotation
+      - _UIPDFPageView
+      - _UIPDFSelection
+install-name: /System/Library/PrivateFrameworks/CorePDF.framework/CorePDF
+objc-constraint: none
+platform: ios
+...

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/CorePrediction.framework/CorePrediction.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/CorePrediction.framework/CorePrediction.tbd
new file mode 100644 (file)
index 0000000..df3faaf
--- /dev/null
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/CorePrediction.framework/CorePrediction.tbd
@@ -0,0 +1,22 @@
+--- !tapi-tbd-v2
+archs:
+  - armv7
+  - armv7s
+  - arm64
+  - i386
+  - x86_64
+exports:
+  -
+    archs:
+      - armv7
+      - armv7s
+      - arm64
+      - i386
+      - x86_64
+    symbols:
+      - _svm_load_model
+      - _svm_predict_values
+install-name: /System/Library/PrivateFrameworks/CorePrediction.framework/CorePrediction
+objc-constraint: none
+platform: ios
+...

diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/GraphicsServices.framework/GraphicsServices.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/GraphicsServices.framework/GraphicsServices.tbd
new file mode 100644 (file)
index 0000000..ab1c406
--- /dev/null
+++ b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/11/GraphicsServices.framework/GraphicsServices.tbd
@@ -0,0 +1,25 @@
+--- !tapi-tbd-v2
+archs:
+  - armv7
+  - armv7s
+  - arm64
+  - i386
+  - x86_64
+exports:
+  -
+    archs:
+      - armv7
+      - armv7s
+      - arm64
+      - i386
+      - x86_64
+    symbols:
+      - _GSCurrentEventTimestamp
+      - _GSFontInitialize
+      - _GSFontPurgeFontCache
+      - _GSInitialize
+      - _GSSystemRootDirectory
+install-name: /System/Library/PrivateFrameworks/GraphicsServices.framework/GraphicsServices
+objc-constraint: none
+platform: ios
+...