Fix the watchOS build; stop unnecessarily linking CorePDF
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2018 09:00:54 +0000 (09:00 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2018 09:00:54 +0000 (09:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=192356
<rdar://problem/46427844>

Reviewed by Wenson Hsieh.

* Configurations/WebKit.xcconfig:
* Platform/spi/ios/CorePDFSPI.h:

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

Source/WebKit/ChangeLog
Source/WebKit/Configurations/WebKit.xcconfig
Source/WebKit/Platform/spi/ios/CorePDFSPI.h

index b9c0349..6bc5f4b 100644 (file)
@@ -1,3 +1,14 @@
+2018-12-04  Tim Horton  <timothy_horton@apple.com>
+
+        Fix the watchOS build; stop unnecessarily linking CorePDF
+        https://bugs.webkit.org/show_bug.cgi?id=192356
+        <rdar://problem/46427844>
+
+        Reviewed by Wenson Hsieh.
+
+        * Configurations/WebKit.xcconfig:
+        * Platform/spi/ios/CorePDFSPI.h:
+
 2018-12-03  Tim Horton  <timothy_horton@apple.com>
 
         Make it possible to disable animated keyboard scrolling behavior
index 6bb8c4f..c7f1a6a 100644 (file)
@@ -53,8 +53,9 @@ WK_ASSERTION_SERVICES_LDFLAGS_cocoatouch = -framework AssertionServices;
 WK_CARBON_LDFLAGS = $(WK_CARBON_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_CARBON_LDFLAGS_macosx = -framework Carbon;
 
-WK_CORE_PDF_LDFLAGS = $(WK_CORE_PDF_LDFLAGS_$(WK_COCOA_TOUCH));
-WK_CORE_PDF_LDFLAGS_cocoatouch = -framework CorePDF;
+WK_CORE_PDF_LDFLAGS = $(WK_CORE_PDF_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_CORE_PDF_LDFLAGS_iphoneos = -framework CorePDF;
+WK_CORE_PDF_LDFLAGS_iphonesimulator = -framework CorePDF;
 
 WK_CORE_PREDICTION_LDFLAGS = $(WK_CORE_PREDICTION_LDFLAGS_$(WK_HAVE_CORE_PREDICTION));
 WK_CORE_PREDICTION_LDFLAGS_YES = $(WK_MACOS_WEAK_FRAMEWORK) CorePrediction;
index 47e680f..465d663 100644 (file)
@@ -23,6 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)
+
 #import <CoreGraphics/CoreGraphics.h>
 #import <UIKit/UIKit.h>
 
@@ -139,3 +141,5 @@ typedef enum {
 @end
 
 #endif
+
+#endif // ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)