Skip to content

Commit

Permalink
Cherry-pick c6eb5df. rdar://122947207
Browse files Browse the repository at this point in the history
    Unreviewed, fix internal builds that use `WKWebView+TextExtraction.swift.in`
    rdar://122947207

    Partially revert support for text extraction, until we're able to reliably block the WebKitSwift
    installhdrs phase on the WebKitAdditions build being finished.

    * Source/WebKit/Configurations/WebKitSwift.xcconfig:
    * Source/WebKit/DerivedSources.make:

    Canonical link: https://commits.webkit.org/274628@main

Canonical link: https://commits.webkit.org/274594.1@safari-7619.1.4-branch
  • Loading branch information
whsieh authored and rjepstein committed Feb 14, 2024
1 parent 9c88c8d commit 4c6b791
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Source/WebKit/Configurations/WebKitSwift.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ WK_HAVE_MARKETPLACE_KIT_IOS_SINCE_17 = YES;
WK_EXCLUDED_MARKETPLACE_KIT_WRAPPER_FILES = $(WK_EXCLUDED_MARKETPLACE_KIT_WRAPPER_FILES_$(WK_AND_$(USE_INTERNAL_SDK)_$(WK_HAVE_MARKETPLACE_KIT)));
WK_EXCLUDED_MARKETPLACE_KIT_WRAPPER_FILES_NO = MarketplaceKitWrapper.swift;

WK_EXCLUDED_TEXT_EXTRACTION_FILES = $(WK_EXCLUDED_TEXT_EXTRACTION_FILES_$(USE_INTERNAL_SDK))
WK_EXCLUDED_TEXT_EXTRACTION_FILES_ = WKWebView+TextExtraction.swift
// FIXME: Remove this from excluded files once we figure out how to block WebKitSwift's
// installhdrs phase on WebKitAdditions.
WK_EXCLUDED_TEXT_EXTRACTION_FILES = WKWebView+TextExtraction.swift

EXCLUDED_SOURCE_FILE_NAMES = $(WK_EXCLUDED_COORDINATOR_FILES) $(WK_EXCLUDED_MARKETPLACE_KIT_WRAPPER_FILES) $(WK_EXCLUDED_TEXT_EXTRACTION_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
SWIFT_INSTALL_OBJC_HEADER = NO
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/DerivedSources.make
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,6 @@ all : module.private.modulemap

ifeq ($(USE_INTERNAL_SDK),YES)
WEBKIT_ADDITIONS_SWIFT_FILES = \
WKWebView+TextExtraction.swift \
#

$(WEBKIT_ADDITIONS_SWIFT_FILES): %.swift : %.swift.in
Expand Down

0 comments on commit 4c6b791

Please sign in to comment.