[webkit-changes] [295303] branches/safari-7614.1.15-branch/Source

Mon, 06 Jun 2022 16:24:37 -0700

Title: [295303] branches/safari-7614.1.15-branch/Source
Revision
295303
Author
repst...@apple.com
Date
2022-06-06 16:23:59 -0700 (Mon, 06 Jun 2022)

Log Message

Cherry-pick r295134. rdar://problem/93068926

    Fix build failures introduced in "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK"
    https://bugs.webkit.org/show_bug.cgi?id=240408

    Reviewed by Alexey Proskuryakov.

    Revert "Revert "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK""
    This reverts commit 680fe6580f261df69a607a33b6252f3e19704169.

    Apply small fixups across xcconfig files to address regressions:

    - Fix SYSTEM_HEADER_SEARCH_PATHS not referring to Catlyst's include
      directory.
    - Replace /usr/local/include literal in PROFILE_DATA_PATH with
      WK_ALTERNATE_WEBKIT_SDK_PATH and WK_LIBRARY_HEADERS_FOLDER_PATH to
      select the correct profdata for Catalyst or self-contained builds.

    * Source/_javascript_Core/Configurations/Base.xcconfig: Clean up an old
      WK_STATICLIB_INSTALL_PREFIX, replacing it with
      WK_LIBRARY_HEADERS_FOLDER_PATH.
    * Source/_javascript_Core/Configurations/_javascript_Core.xcconfig:
    * Source/WebCore/Configurations/WebCore.xcconfig:
    * Source/WebCore/PAL/Configurations/PAL.xcconfig:
    * Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj: PAL's
      SDKVariant.xcconfig was not included in the project for some reason.
      This is fine for building (as it's still includable) but prevents
      Xcode from indexing it. Add it.
    * Source/WebGPU/Configurations/WGSL.xcconfig:
    * Source/WebGPU/Configurations/WebGPU.xcconfig:
    * Source/WebKit/Configurations/BaseTarget.xcconfig:
    * Source/WebKit/Configurations/SandboxProfiles.xcconfig: Clean up an old
      WK_STATICLIB_INSTALL_PREFIX setting. We don't need to redirect sandbox
      profiles to a separate directory, like we do headers and static
      libraries, so leave these paths hard coded to /usr/local/include.
    * Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig:

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

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

Modified Paths

Diff

Modified: branches/safari-7614.1.15-branch/Source/_javascript_Core/Configurations/Base.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/_javascript_Core/Configurations/Base.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/_javascript_Core/Configurations/Base.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -110,7 +110,7 @@
 
 HEADER_SEARCH_PATHS = . "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(HEADER_SEARCH_PATHS);
 LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_INSTALL_PATH) $(inherited);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
 
 WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;

Modified: branches/safari-7614.1.15-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -43,7 +43,7 @@
 PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
 PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata;
 PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
-PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed;
 
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/_javascript_Core/_javascript_Core.profdata;

Modified: branches/safari-7614.1.15-branch/Source/WebCore/Configurations/WebCore.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebCore/Configurations/WebCore.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebCore/Configurations/WebCore.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -31,8 +31,8 @@
 
 PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
 PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata;
-PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/WebCore.profdata.compressed;
-PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/WebCore.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebCore.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebCore.profdata.compressed;
 
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.profdata;
 
@@ -77,7 +77,7 @@
 LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc/sdk/objc/Framework/Headers $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc/sdk/objc/Framework/Headers;
 
 HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
 LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_INSTALL_PATH) $(inherited);
 
 INFOPLIST_FILE = Info.plist;

Modified: branches/safari-7614.1.15-branch/Source/WebCore/PAL/Configurations/PAL.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebCore/PAL/Configurations/PAL.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebCore/PAL/Configurations/PAL.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -38,7 +38,7 @@
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
 
 HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(inherited);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
 INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH);
 INSTALLHDRS_COPY_PHASE = YES;
 INSTALLHDRS_SCRIPT_PHASE = YES;

Modified: branches/safari-7614.1.15-branch/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj	2022-06-06 23:23:59 UTC (rev 295303)
@@ -938,6 +938,7 @@
 		CE5673862151A7B9002F92D7 /* IOKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOKitSPI.h; sourceTree = "<group>"; };
 		DD05A35F27BF0AC40096EFAB /* libWTF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD0B43C127F67999009E31FC /* WebGPU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WebGPU.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		DDDFE84128481A6B006F1EE5 /* SDKVariant.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SDKVariant.xcconfig; sourceTree = "<group>"; };
 		DDE99300278D07B800F60D26 /* libWebKitAdditions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libWebKitAdditions.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKitPrivateSPI.h; sourceTree = "<group>"; };
 		E327C0DE260BDC90002281C5 /* NotifySPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotifySPI.h; sourceTree = "<group>"; };
@@ -1246,6 +1247,7 @@
 				1C09D0631E31EC3100725F18 /* Base.xcconfig */,
 				1C09D0621E31EC2800725F18 /* DebugRelease.xcconfig */,
 				1C09D05D1E31C77A00725F18 /* PAL.xcconfig */,
+				DDDFE84128481A6B006F1EE5 /* SDKVariant.xcconfig */,
 				1C67CEA21E32EE2600F80F2E /* Version.xcconfig */,
 				37119A7820CCB5FF002C6DC9 /* WebKitTargetConditionals.xcconfig */,
 			);

Modified: branches/safari-7614.1.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2022-06-06 23:23:59 UTC (rev 295303)
@@ -24674,6 +24674,8 @@
 		6FB7D2D5250FD7B5000207AA /* flex */ = {
 			isa = PBXGroup;
 			children = (
+				6F047A9128453EDB00C25EE7 /* FlexLayout.h */,
+				6F047A9028453ED200C25EE7 /* FlexLayout.cpp */,
 				6FB17475283A8FF40067D8CA /* FlexFormattingConstraints.h */,
 				6FB7D2D7250FD7E5000207AA /* FlexFormattingContext.cpp */,
 				6FB7D2D9250FD7FC000207AA /* FlexFormattingContext.h */,
@@ -35254,6 +35256,7 @@
 				BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */,
 				2D5A5931152525D00036EE51 /* ImageOrientation.h in Headers */,
 				F46D5386273D7E460009FA80 /* ImageOverlay.h in Headers */,
+				6F047A9228453EDB00C25EE7 /* FlexLayout.h in Headers */,
 				F482434B260C33060022497C /* ImageOverlayController.h in Headers */,
 				F446EDE1265DB1E50031DA8F /* ImageOverlayDataDetectionResultIdentifier.h in Headers */,
 				72283F0E230B268C00F5D828 /* ImagePaintingOptions.h in Headers */,

Modified: branches/safari-7614.1.15-branch/Source/WebGPU/Configurations/WGSL.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebGPU/Configurations/WGSL.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebGPU/Configurations/WGSL.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -26,7 +26,7 @@
 PRIVATE_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH);
 PUBLIC_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH);
 HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(inherited);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
 PRODUCT_NAME = wgsl;
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));

Modified: branches/safari-7614.1.15-branch/Source/WebGPU/Configurations/WebGPU.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -26,7 +26,7 @@
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpointer-arith -Wredundant-decls -Wwrite-strings -Wexit-time-destructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion -Wthread-safety -Wno-typedef-redefinition -Wno-ignored-qualifiers;
 
 HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(inherited);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(BUILT_PRODUCTS_DIR)/DerivedSources/WebGPU/metal-cpp $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(BUILT_PRODUCTS_DIR)/DerivedSources/WebGPU/metal-cpp $(inherited);
 
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
 WK_PRIVATE_FRAMEWORKS_DIR_[sdk=macos*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(TARGET_MAC_OS_X_VERSION_MAJOR);

Modified: branches/safari-7614.1.15-branch/Source/WebKit/Configurations/Base.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebKit/Configurations/Base.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebKit/Configurations/Base.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -182,7 +182,7 @@
 WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
 
 EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a _javascript_Core.framework 
-WK_WEBKITADDITIONS_INSTALL_PATH = $(WK_STATICLIB_INSTALL_PREFIX)/include/WebKitAdditions
+WK_WEBKITADDITIONS_INSTALL_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions
 WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(SDKROOT)/$(WK_WEBKITADDITIONS_INSTALL_PATH)
 WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-input.xcfilelist
 WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-output.xcfilelist

Modified: branches/safari-7614.1.15-branch/Source/WebKit/Configurations/BaseTarget.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebKit/Configurations/BaseTarget.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -49,12 +49,12 @@
 ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)
 
 HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
 
 PROFILE_DATA_PATH = $(PROFILE_DATA_PATH_INTERNAL_$(USE_INTERNAL_SDK));
 PROFILE_DATA_PATH_INTERNAL_ = $(SRCROOT)/../../Tools/Profiling/Empty.profdata;
-PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/WebKit.profdata.compressed;
-PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/WebKit.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/Profiling/WebKit.profdata.compressed;
+PROFILE_DATA_PATH_INTERNAL_YES[config=Production] = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebKit.profdata.compressed;
 
 PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.profdata;

Modified: branches/safari-7614.1.15-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2022-06-06 23:23:59 UTC (rev 295303)
@@ -2752,6 +2752,7 @@
 			dstSubfolderSpec = 16;
 			files = (
 				DDE992F6278D071F00F60D26 /* libWebKitAdditions.a in Product Dependencies */,
+				DDAB377628234B3900890546 /* AuthenticationServicesCore.framework in Product Dependencies */,
 			);
 			name = "Product Dependencies";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -15088,6 +15089,7 @@
 				07A5EBBC1C7BA43E00B9CA69 /* WKFrameHandleRef.h in Headers */,
 				1A4D664C18A3030E00D82E21 /* WKFrameInfo.h in Headers */,
 				2DF9EEE81A78245500B6CFBE /* WKFrameInfoInternal.h in Headers */,
+				DDDFE827284699EC006F1EE5 /* SafariServicesSPI.h in Headers */,
 				1A6FA21E1BD0435B00AAA650 /* WKFrameInfoPrivate.h in Headers */,
 				2D3A65E71A7C3AA700CAC637 /* WKFrameInfoRef.h in Headers */,
 				BCB9F6A51123DD0D00A137E0 /* WKFramePolicyListener.h in Headers */,

Modified: branches/safari-7614.1.15-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (295302 => 295303)


--- branches/safari-7614.1.15-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-06-06 23:23:55 UTC (rev 295302)
+++ branches/safari-7614.1.15-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-06-06 23:23:59 UTC (rev 295303)
@@ -71,7 +71,7 @@
 WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU;
 
 HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
 INFOPLIST_FILE = mac/Info.plist;
 
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to