Fix the watchOS engineering build.
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 28 Apr 2019 19:28:09 +0000 (19:28 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 28 Apr 2019 19:28:09 +0000 (19:28 +0000)
.:

* Source/Makefile: Moved libwebrtc logic into Source/ThirdParty/Makefile.

Source/ThirdParty:

* Makefile: Started building libwebrtc on watchOS.

Source/ThirdParty/libwebrtc:

* Makefile: Set OTHER_OPTIONS to build libwebrtc's boringssl target on watchOS, which is a
dependency for TestWebKitAPI's TCPServer.

Source/WebCore:

* Modules/webgpu/WebGPUComputePassEncoder.cpp: Included Logging.h.

Tools:

* TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
(TestWebKitAPI::TEST): AVVideoPerformanceMetrics does not exist on watchOS.

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

ChangeLog
Source/Makefile
Source/ThirdParty/ChangeLog
Source/ThirdParty/Makefile
Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Makefile
Source/WebCore/ChangeLog
Source/WebCore/Modules/webgpu/WebGPUComputePassEncoder.cpp
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm

index 6e2ef347dbc2755f6ff117395171979054b3eefe..b4a5d167ac1ea78ac30a9ec950292b074a0556ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-28  Andy Estes  <aestes@apple.com>
+
+        Fix the watchOS engineering build.
+
+        * Source/Makefile: Moved libwebrtc logic into Source/ThirdParty/Makefile.
+
 2019-04-26  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Add WEBKIT_EXECUTABLE macro
index 61cfb87dcdb57c7fd7d07f49c9aa4ac3ff0208d7..6a9b06c5a195a8a8cc5e1f588ee9b6c0357597eb 100644 (file)
@@ -1,28 +1,14 @@
-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 JavaScriptCore ThirdParty/ANGLE $(LIBWEBRTC_MODULE) WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
+MODULES = bmalloc WTF JavaScriptCore ThirdParty WebCore $(WEBINSPECTORUI_MODULE) WebKitLegacy WebKit
 
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
index 5810b3b1376bed7eb9eada67d3c4b852143b1e15..b532f1534990cfea416543f69ee7cd612c1ff955 100644 (file)
@@ -1,3 +1,9 @@
+2019-04-28  Andy Estes  <aestes@apple.com>
+
+        Fix the watchOS engineering build.
+
+        * Makefile: Started building libwebrtc on watchOS.
+
 2019-04-25  Alex Christensen  <achristensen@webkit.org>
 
         Start using C++17
index 76ec04ebf8d3a209662fe99cfdd372e8bc893a61..871e779e7e7933ad67e047a8c292dfaa99653375 100644 (file)
@@ -1,4 +1,28 @@
-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=$$?; \
index 1b4b8993a37c465078e71f32705530bb5562d272..e7ca2f8a6a3136dbe6e722ed635009569d20afcc 100644 (file)
@@ -1,3 +1,10 @@
+2019-04-28  Andy Estes  <aestes@apple.com>
+
+        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  <jberlin@webkit.org>
 
         Add new mac target numbers
index cb4c11a57c6739a1426a5bb9d812b73001e69d91..97566b80b68d0796b6ad767d5ac43293add3c87b 100644 (file)
@@ -1 +1,7 @@
+ifneq (,$(SDKROOT))
+       ifneq (,$(findstring watch,$(SDKROOT)))
+               OTHER_OPTIONS += -target boringssl
+       endif
+endif
+
 include ../Makefile.shared
index 662d93cc81301bcbbb8cd90da4ee4fd1a36c855d..8aceb48c6526b85696c49d6710e1ba68639788ea 100644 (file)
@@ -1,3 +1,9 @@
+2019-04-28  Andy Estes  <aestes@apple.com>
+
+        Fix the watchOS engineering build.
+
+        * Modules/webgpu/WebGPUComputePassEncoder.cpp: Included Logging.h.
+
 2019-04-28  Youenn Fablet  <youenn@apple.com>
 
         Remove no longer needed mDNS ICE candidate resolution code
index 770d1a1b14d4c20c41461283e6c241d59185d6cf..acfa788c86bc91b8b073a6d5b3d5515772723cce 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "GPUComputePassEncoder.h"
 #include "GPUProgrammablePassEncoder.h"
+#include "Logging.h"
 #include "WebGPUComputePipeline.h"
 
 namespace WebCore {
index 9c307d39eb8a622dc232f8b9ac7ee4ed908227fb..f77c5869d11c229dc14f3008a1ec56e3737cc848 100644 (file)
@@ -1,3 +1,10 @@
+2019-04-28  Andy Estes  <aestes@apple.com>
+
+        Fix the watchOS engineering build.
+
+        * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
+        (TestWebKitAPI::TEST): AVVideoPerformanceMetrics does not exist on watchOS.
+
 2019-04-27  Chris Dumez  <cdumez@apple.com>
 
         [WKTR] Move test timeout handling to the UIProcess
index 39c8dfacb08bdecf3c72adb89f5644d9dc092e1e..ddf2c2d2c81b8759d78f10d639bf7a3f6cedaadc 100644 (file)
@@ -80,7 +80,9 @@ TEST(AVFoundationSoftLink, Classes)
     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);