Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit f44f6d7

Browse files
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: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@238849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 49eb6fe commit f44f6d7

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

Source/WebKit/ChangeLog

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2018-12-04 Tim Horton <[email protected]>
2+
3+
Fix the watchOS build; stop unnecessarily linking CorePDF
4+
https://bugs.webkit.org/show_bug.cgi?id=192356
5+
<rdar://problem/46427844>
6+
7+
Reviewed by Wenson Hsieh.
8+
9+
* Configurations/WebKit.xcconfig:
10+
* Platform/spi/ios/CorePDFSPI.h:
11+
112
2018-12-03 Tim Horton <[email protected]>
213

314
Make it possible to disable animated keyboard scrolling behavior

Source/WebKit/Configurations/WebKit.xcconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ WK_ASSERTION_SERVICES_LDFLAGS_cocoatouch = -framework AssertionServices;
5353
WK_CARBON_LDFLAGS = $(WK_CARBON_LDFLAGS_$(WK_PLATFORM_NAME));
5454
WK_CARBON_LDFLAGS_macosx = -framework Carbon;
5555

56-
WK_CORE_PDF_LDFLAGS = $(WK_CORE_PDF_LDFLAGS_$(WK_COCOA_TOUCH));
57-
WK_CORE_PDF_LDFLAGS_cocoatouch = -framework CorePDF;
56+
WK_CORE_PDF_LDFLAGS = $(WK_CORE_PDF_LDFLAGS_$(WK_PLATFORM_NAME));
57+
WK_CORE_PDF_LDFLAGS_iphoneos = -framework CorePDF;
58+
WK_CORE_PDF_LDFLAGS_iphonesimulator = -framework CorePDF;
5859

5960
WK_CORE_PREDICTION_LDFLAGS = $(WK_CORE_PREDICTION_LDFLAGS_$(WK_HAVE_CORE_PREDICTION));
6061
WK_CORE_PREDICTION_LDFLAGS_YES = $(WK_MACOS_WEAK_FRAMEWORK) CorePrediction;

Source/WebKit/Platform/spi/ios/CorePDFSPI.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
* THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26+
#if ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)
27+
2628
#import <CoreGraphics/CoreGraphics.h>
2729
#import <UIKit/UIKit.h>
2830

@@ -139,3 +141,5 @@ typedef enum {
139141
@end
140142

141143
#endif
144+
145+
#endif // ENABLE(WKLEGACYPDFVIEW) || ENABLE(WKPDFVIEW)

0 commit comments

Comments
 (0)