Title: [286768] trunk/Source
- Revision
- 286768
- Author
- mmaxfi...@apple.com
- Date
- 2021-12-09 00:37:59 -0800 (Thu, 09 Dec 2021)
Log Message
[WebGPU] Fix WebGPU build in Apple's internal build system
https://bugs.webkit.org/show_bug.cgi?id=234070
Unreviewed.
The PAL headers get put in a different place.
Source/WebKit:
No new tests because there is no behavior change.
* Configurations/BaseTarget.xcconfig:
Source/WebKitLegacy/mac:
* Configurations/WebKitLegacy.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (286767 => 286768)
--- trunk/Source/WebKit/ChangeLog 2021-12-09 08:26:34 UTC (rev 286767)
+++ trunk/Source/WebKit/ChangeLog 2021-12-09 08:37:59 UTC (rev 286768)
@@ -1,3 +1,16 @@
+2021-12-09 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [WebGPU] Fix WebGPU build in Apple's internal build system
+ https://bugs.webkit.org/show_bug.cgi?id=234070
+
+ Unreviewed.
+
+ The PAL headers get put in a different place.
+
+ No new tests because there is no behavior change.
+
+ * Configurations/BaseTarget.xcconfig:
+
2021-12-09 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][a11y] Ensure atspi wrappers have root set at construction time
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (286767 => 286768)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-09 08:26:34 UTC (rev 286767)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-09 08:37:59 UTC (rev 286768)
@@ -46,11 +46,12 @@
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(WK_ENABLE_EXPERIMENTAL_FEATURES) $(WK_CORE_PREDICTION_DEFINES) $(WK_FORMATREADERBUNDLE_CODESIGNING_DEFINES) $(inherited) FRAMEWORK_NAME=WebKit;
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
+WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)/usr/local/include/pal/graphics/WebGPU;
ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));
ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
-HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit "$(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)/usr/local/include "$(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);
OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (286767 => 286768)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-12-09 08:26:34 UTC (rev 286767)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-12-09 08:37:59 UTC (rev 286768)
@@ -1,3 +1,14 @@
+2021-12-09 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [WebGPU] Fix WebGPU build in Apple's internal build system
+ https://bugs.webkit.org/show_bug.cgi?id=234070
+
+ Unreviewed.
+
+ The PAL headers get put in a different place.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
2021-12-08 Truitt Savell <tsav...@apple.com>
Unreviewed, reverting r286632.
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (286767 => 286768)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-12-09 08:26:34 UTC (rev 286767)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-12-09 08:37:59 UTC (rev 286768)
@@ -57,8 +57,9 @@
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
+WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)/usr/local/include/pal/graphics/WebGPU;
-HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" "$(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
+HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
INFOPLIST_FILE = mac/Info.plist;
INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
