Diff
Modified: trunk/ChangeLog (244725 => 244726)
--- trunk/ChangeLog 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/ChangeLog 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1,3 +1,9 @@
+2019-04-28 Andy Estes <[email protected]>
+
+ Fix the watchOS engineering build.
+
+ * Source/Makefile: Moved libwebrtc logic into Source/ThirdParty/Makefile.
+
2019-04-26 Don Olmstead <[email protected]>
[CMake] Add WEBKIT_EXECUTABLE macro
Modified: trunk/Source/Makefile (244725 => 244726)
--- trunk/Source/Makefile 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Source/Makefile 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1,29 +1,15 @@
-LIBWEBRTC_MODULE =
WEBINSPECTORUI_MODULE =
-ifeq (iosmac,$(SDK_VARIANT))
- DISABLE_LIBWEBRTC = 1
-endif
-
ifneq (,$(SDKROOT))
- ifneq (,$(findstring iphone,$(SDKROOT)))
- LIBWEBRTC_MODULE = ThirdParty/libwebrtc
- endif
ifneq (,$(findstring macosx,$(SDKROOT)))
- LIBWEBRTC_MODULE = ThirdParty/libwebrtc
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
else
- LIBWEBRTC_MODULE = ThirdParty/libwebrtc
WEBINSPECTORUI_MODULE = WebInspectorUI
endif
-ifneq (,$(DISABLE_LIBWEBRTC))
- LIBWEBRTC_MODULE =
-endif
+MODULES = bmalloc WTF _javascript_Core ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
-MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE $(LIBWEBRTC_MODULE) WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
-
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
Modified: trunk/Source/ThirdParty/ChangeLog (244725 => 244726)
--- trunk/Source/ThirdParty/ChangeLog 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Source/ThirdParty/ChangeLog 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1,3 +1,9 @@
+2019-04-28 Andy Estes <[email protected]>
+
+ Fix the watchOS engineering build.
+
+ * Makefile: Started building libwebrtc on watchOS.
+
2019-04-25 Alex Christensen <[email protected]>
Start using C++17
Modified: trunk/Source/ThirdParty/Makefile (244725 => 244726)
--- trunk/Source/ThirdParty/Makefile 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Source/ThirdParty/Makefile 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1,5 +1,29 @@
-MODULES = ANGLE libwebrtc
+LIBWEBRTC_MODULE =
+ifeq (iosmac,$(SDK_VARIANT))
+ DISABLE_LIBWEBRTC = 1
+endif
+
+ifneq (,$(SDKROOT))
+ ifneq (,$(findstring iphone,$(SDKROOT)))
+ LIBWEBRTC_MODULE = libwebrtc
+ endif
+ ifneq (,$(findstring macosx,$(SDKROOT)))
+ LIBWEBRTC_MODULE = libwebrtc
+ endif
+ ifneq (,$(findstring watch,$(SDKROOT)))
+ LIBWEBRTC_MODULE = libwebrtc
+ endif
+else
+ LIBWEBRTC_MODULE = libwebrtc
+endif
+
+ifneq (,$(DISABLE_LIBWEBRTC))
+ LIBWEBRTC_MODULE =
+endif
+
+MODULES = ANGLE $(LIBWEBRTC_MODULE)
+
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (244725 => 244726)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1,3 +1,10 @@
+2019-04-28 Andy Estes <[email protected]>
+
+ Fix the watchOS engineering build.
+
+ * Makefile: Set OTHER_OPTIONS to build libwebrtc's boringssl target on watchOS, which is a
+ dependency for TestWebKitAPI's TCPServer.
+
2019-04-26 Jessie Berlin <[email protected]>
Add new mac target numbers
Modified: trunk/Source/ThirdParty/libwebrtc/Makefile (244725 => 244726)
--- trunk/Source/ThirdParty/libwebrtc/Makefile 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Source/ThirdParty/libwebrtc/Makefile 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1 +1,7 @@
+ifneq (,$(SDKROOT))
+ ifneq (,$(findstring watch,$(SDKROOT)))
+ OTHER_OPTIONS += -target boringssl
+ endif
+endif
+
include ../Makefile.shared
Modified: trunk/Source/WebCore/ChangeLog (244725 => 244726)
--- trunk/Source/WebCore/ChangeLog 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Source/WebCore/ChangeLog 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1,3 +1,9 @@
+2019-04-28 Andy Estes <[email protected]>
+
+ Fix the watchOS engineering build.
+
+ * Modules/webgpu/WebGPUComputePassEncoder.cpp: Included Logging.h.
+
2019-04-28 Youenn Fablet <[email protected]>
Remove no longer needed mDNS ICE candidate resolution code
Modified: trunk/Source/WebCore/Modules/webgpu/WebGPUComputePassEncoder.cpp (244725 => 244726)
--- trunk/Source/WebCore/Modules/webgpu/WebGPUComputePassEncoder.cpp 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Source/WebCore/Modules/webgpu/WebGPUComputePassEncoder.cpp 2019-04-28 19:28:09 UTC (rev 244726)
@@ -30,6 +30,7 @@
#include "GPUComputePassEncoder.h"
#include "GPUProgrammablePassEncoder.h"
+#include "Logging.h"
#include "WebGPUComputePipeline.h"
namespace WebCore {
Modified: trunk/Tools/ChangeLog (244725 => 244726)
--- trunk/Tools/ChangeLog 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Tools/ChangeLog 2019-04-28 19:28:09 UTC (rev 244726)
@@ -1,3 +1,10 @@
+2019-04-28 Andy Estes <[email protected]>
+
+ Fix the watchOS engineering build.
+
+ * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
+ (TestWebKitAPI::TEST): AVVideoPerformanceMetrics does not exist on watchOS.
+
2019-04-27 Chris Dumez <[email protected]>
[WKTR] Move test timeout handling to the UIProcess
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm (244725 => 244726)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2019-04-28 19:06:01 UTC (rev 244725)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2019-04-28 19:28:09 UTC (rev 244726)
@@ -80,7 +80,9 @@
EXPECT_NE(PAL::getAVContentKeySessionClass(), nullptr);
EXPECT_NE(PAL::getAVAssetResourceLoadingRequestClass(), nullptr);
EXPECT_NE(PAL::getAVAssetReaderSampleReferenceOutputClass(), nullptr);
+#if !PLATFORM(WATCHOS)
EXPECT_NE(PAL::getAVVideoPerformanceMetricsClass(), nullptr);
+#endif
EXPECT_NE(PAL::getAVSampleBufferAudioRendererClass(), nullptr);
EXPECT_NE(PAL::getAVSampleBufferDisplayLayerClass(), nullptr);
EXPECT_NE(PAL::getAVSampleBufferRenderSynchronizerClass(), nullptr);
