Attachment 359527 Details for Bug 189553 – Patch for landing

[patch] Patch for landing

bug-189553-20190118124043.patch (text/plain), 100.97 KB, created by Jer Noble on 2019-01-18 12:40:43 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2019-01-18 12:40:43 PST

Size: 100.97 KB

patch

obsolete

>Subversion Revision: 240163
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 4c3c557b079a4d4e3dbaa0e17f2a68c0432ffd11..aa1563bd2827cbd6c58b1becf609b05889d32a54 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-18  Keith Miller  <keith_miller@apple.com>
> 
>         Gigacages should start allocations from a slide
>diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
>index 87e04c922bae7d3c81e79869390fcfcbb7885c7a..c7e8a8f7f57abaf3dce781fd4e79b85896c78d8a 100644
>--- a/Source/ThirdParty/ANGLE/ChangeLog
>+++ b/Source/ThirdParty/ANGLE/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-17  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r240124.
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index 98cb6212e187656f7b46b176ce63f5796f082079..cb62301d5b63bfda52f01cd5c7d147081b92363e 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-17  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r240124.
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 328a95ce5a7b78c18ae633fb68886cc8315daeff..d3e115e26b7223de069811f56f97134004c697be 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-18  Keith Miller  <keith_miller@apple.com>
> 
>         Gigacages should start allocations from a slide
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1d16aef8fbab95ef93892d8d8df40d1657fa78c8..4c79b24c802212c1977cd9c1326db713ea224085 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+        * Configurations/WebCore.xcconfig:
>+
> 2019-01-18  Antti Koivisto  <antti@apple.com>
> 
>         Implement asynchronous frame scrolling for iOS
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index fb1f10b68b68582252de9e3a7093686ca96614b9..ace8b3d01298af70d20478a9a435313de04736b4 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/PAL.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-17  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r240124.
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index b56793b9ad0f91bc6f3431539b88954767ad119a..e0f1f916e6b659509412a56fe29c73bf0ef74ee6 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-17  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r240124.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9f789b9159c85bcb40ece3ab92afb61a85e0fff3..b2bfbd1db075b38b97332e5007f1e4d7d44742ba 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/BaseTarget.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-18  Antti Koivisto  <antti@apple.com>
> 
>         Implement asynchronous frame scrolling for iOS
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index f36cfd4e290d2a6bd3b7ce35319f39e379a53179..b4daec34d49e7799c1ec7765d1ca0a583c4e9901 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+        * Configurations/WebKitLegacy.xcconfig:
>+
> 2019-01-17  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r240124.
>diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
>index 918e5627e71132a848b34750cb52bc3b28f6ef2f..5c3cd92f2e643e21080e2011fe196f0f084b78cd 100644
>--- a/Source/bmalloc/ChangeLog
>+++ b/Source/bmalloc/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-18  Keith Miller  <keith_miller@apple.com>
> 
>         Gigacages should start allocations from a slide
>diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig
>index aedab06de88179a95d5429bf80801f79fa06ecd4..77e77efe0bc05c4b310cfb0849697b741054e5cf 100644
>--- a/Source/JavaScriptCore/Configurations/Base.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -151,12 +152,7 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
> WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
>@@ -167,13 +163,6 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRA
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
> 
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
>index 706e2a72af9a2eb320e2189d6a4ca09f24fd6f50..bc2bafaead296503179bb1bf7fd87293699cdd94 100644
>--- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
>+++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
>@@ -1,4 +1,5 @@
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -75,20 +76,10 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
> ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
> ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
> ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
> 
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
> WK_LLVM_LTO_NO = NO;
> WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
>diff --git a/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>index e604f8b8b3da85ca5178e328a4580ff5fded72cd..be3c9078d5175841a97d4e5f5a93857ef515ea40 100644
>--- a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>+++ b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
>@@ -1,4 +1,5 @@
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -99,10 +100,6 @@ EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = $(inherited) "$(PROJECT_DIR)/Source/
> NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/WTF/Configurations/Base.xcconfig b/Source/WTF/Configurations/Base.xcconfig
>index 486725a106ea7b8763cc1ab3eb75189613bf84f2..3b9ba220fa2bda27693ec8a62b6e7dc7630e2c6a 100644
>--- a/Source/WTF/Configurations/Base.xcconfig
>+++ b/Source/WTF/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -135,20 +136,6 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
>-WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
> WK_LLVM_LTO_NO = NO;
> WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
>@@ -163,3 +150,7 @@ WK_USER_LTO_MODE_thin = YES_THIN;
> WK_USER_LTO_MODE_none = NO;
> WK_USER_LTO_MODE_ = $(WK_DEFAULT_LTO_MODE);
> WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
>+
>+WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
>+WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>diff --git a/Source/WTF/Configurations/SDKVariant.xcconfig b/Source/WTF/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/WTF/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig
>index 21fef8a035bf6cd2e80ddad493c80eb8387f4e74..f2d8dd3fd90541dfcebcccd60aaa2dcd7d64602c 100644
>--- a/Source/WebCore/Configurations/Base.xcconfig
>+++ b/Source/WebCore/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -127,19 +128,6 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> // This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
> LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebCore/Configurations/SDKVariant.xcconfig b/Source/WebCore/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/WebCore/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index ab84e890de20b2ebcc6a823dc6de5e37ed126764..974221086f7f2c4c11544e336315894c5d534db7 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -165,10 +165,6 @@ JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCor
> 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/WebCore/PAL/Configurations/Base.xcconfig b/Source/WebCore/PAL/Configurations/Base.xcconfig
>index 82cffe613e196228318fbf99e56a652e990e2adf..b85c596d80da3b359265324a9afba64704e93944 100644
>--- a/Source/WebCore/PAL/Configurations/Base.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -124,19 +125,6 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebCore/PAL/Configurations/PAL.xcconfig b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>index 95fa0ccfc41831f800a1fba057005d251c971821..53b7c50214bf695a1aa1dbe72f0642781ec59c5e 100644
>--- a/Source/WebCore/PAL/Configurations/PAL.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>@@ -53,11 +53,6 @@ PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEW
> 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_NO = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/WebInspectorUI/Configurations/Base.xcconfig b/Source/WebInspectorUI/Configurations/Base.xcconfig
>index 3da5d2af428a3965020fb486ad13a2b1bb7c942e..00ebc44fb271ba6de9b1c211ce84af7fada3d8f1 100644
>--- a/Source/WebInspectorUI/Configurations/Base.xcconfig
>+++ b/Source/WebInspectorUI/Configurations/Base.xcconfig
>@@ -1,4 +1,5 @@
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -85,12 +86,7 @@ OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> COMBINE_INSPECTOR_RESOURCES = YES;
> COMBINE_TEST_RESOURCES = NO;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
> WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
>@@ -98,10 +94,6 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
> WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
> 
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/WebKit/Configurations/Base.xcconfig b/Source/WebKit/Configurations/Base.xcconfig
>index d17cf0fb212a8bc26668e29410d695eb8adb50f8..623f6b16632bfcc1dcf7b5c202f0185ec7e8dfae 100644
>--- a/Source/WebKit/Configurations/Base.xcconfig
>+++ b/Source/WebKit/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -135,19 +136,6 @@ TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
> // This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
> LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 405d63bbb012a39e65da8ba8b8908358a258bd6c..1ef156c84c91021196132746d90995ec8e856fdd 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -96,10 +96,6 @@ WK_MANUAL_SANDBOXING_ENABLED[sdk=macosx*] = YES;
> WK_MANUAL_SANDBOXING_DEFINES = $(WK_MANUAL_SANDBOXING_DEFINES_$(WK_MANUAL_SANDBOXING_ENABLED));
> WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/WebKit/Configurations/SDKVariant.xcconfig b/Source/WebKit/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/WebKit/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/WebKitLegacy/mac/Configurations/Base.xcconfig b/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>index 3bb1d8b8433f3369bd20ac3f1d1e4ee4a7f5ea11..0205e3f37434b3c3c0dfe9e7104be1e9e1211024 100644
>--- a/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> CODE_SIGN_IDENTITY = -;
> 
>@@ -124,19 +125,6 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>index 8fe026ebe6b1e28536b1d782eecd2fc02883d4e4..a59291343377c21503eb42fac16fc8ad0add3bb3 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>@@ -126,10 +126,6 @@ WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $
> WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
> WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
> 
> WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
>diff --git a/Source/bmalloc/Configurations/Base.xcconfig b/Source/bmalloc/Configurations/Base.xcconfig
>index 89cea24fa833866418b43303f69f2afaaa3313a4..843a405ea61fd561261670ca56e5dbd8c4d57705 100644
>--- a/Source/bmalloc/Configurations/Base.xcconfig
>+++ b/Source/bmalloc/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -127,20 +128,10 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
> BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
> BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
> BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
> 
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
> WK_LLVM_LTO_NO = NO;
> WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
>diff --git a/Source/bmalloc/Configurations/SDKVariant.xcconfig b/Source/bmalloc/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Source/bmalloc/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5d6c1c2cd2b517da469e44d8089c34c3b6909eea..6db6ef4b687df20093687b6162f1dbb0ef565449 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,41 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        Add a check-webkit-style check that ensures all SDKVariant.xcconfig files match.
>+
>+        * ContentExtensionTester/Configurations/Base.xcconfig:
>+        * ContentExtensionTester/Configurations/SDKVariant.xcconfig: Added.
>+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
>+        * DumpRenderTree/mac/Configurations/SDKVariant.xcconfig: Added.
>+        * ImageDiff/cg/Configurations/Base.xcconfig:
>+        * ImageDiff/cg/Configurations/SDKVariant.xcconfig: Added.
>+        * MiniBrowser/Configurations/Base.xcconfig:
>+        * MiniBrowser/Configurations/SDKVariant.xcconfig: Added.
>+        * MobileMiniBrowser/Configurations/Base.xcconfig:
>+        * MobileMiniBrowser/Configurations/SDKVariant.xcconfig: Added.
>+        * Scripts/webkitpy/style/checker.py:
>+        (_all_categories):
>+        (FileType):
>+        (CheckerDispatcher._file_type):
>+        (CheckerDispatcher._create_checker):
>+        * Scripts/webkitpy/style/checkers/sdkvariant.py: Added.
>+        (SDKVariantChecker):
>+        (SDKVariantChecker.__init__):
>+        (SDKVariantChecker.check):
>+        * TestWebKitAPI/Configurations/Base.xcconfig:
>+        * TestWebKitAPI/Configurations/SDKVariant.xcconfig: Added.
>+        * WebEditingTester/Configurations/Base.xcconfig:
>+        * WebEditingTester/Configurations/SDKVariant.xcconfig: Added.
>+        * WebKitLauncher/Configurations/SDKVariant.xcconfig: Added.
>+        * WebKitTestRunner/Configurations/Base.xcconfig:
>+        * WebKitTestRunner/Configurations/SDKVariant.xcconfig: Added.
>+        * lldb/lldbWebKitTester/Configurations/Base.xcconfig:
>+        * lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-18  Jonathan Bedard  <jbedard@apple.com>
> 
>         webkitpy: Add iPhone and iPad ports
>diff --git a/Tools/ContentExtensionTester/Configurations/Base.xcconfig b/Tools/ContentExtensionTester/Configurations/Base.xcconfig
>index d1fcdb1164f30f97b78309717adf5b47ae836a9b..375daac1101d39544fbf1cdba7a08b7161d3548a 100644
>--- a/Tools/ContentExtensionTester/Configurations/Base.xcconfig
>+++ b/Tools/ContentExtensionTester/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
>index dea913ef4e940e641552ee81d7a63903f0974126..0b6a18169cd45c35f122487cffbf61b588b68e20 100644
>--- a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
>+++ b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
>@@ -22,16 +22,13 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
> USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
> USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
> WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
> WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>diff --git a/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/ImageDiff/cg/Configurations/Base.xcconfig b/Tools/ImageDiff/cg/Configurations/Base.xcconfig
>index 82510ad7c44b33e3928257ccd5fdaa992ee22baa..99a9e0bc37bbd95f2bf86e019c791ffa59bff1f7 100644
>--- a/Tools/ImageDiff/cg/Configurations/Base.xcconfig
>+++ b/Tools/ImageDiff/cg/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/MiniBrowser/Configurations/Base.xcconfig b/Tools/MiniBrowser/Configurations/Base.xcconfig
>index 01c137229057eae2dd5c085b37e9a987ce022174..7141400b612bbd744427a8b326ead2daa30a6122 100644
>--- a/Tools/MiniBrowser/Configurations/Base.xcconfig
>+++ b/Tools/MiniBrowser/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/MobileMiniBrowser/Configurations/Base.xcconfig b/Tools/MobileMiniBrowser/Configurations/Base.xcconfig
>index 8960785a037fb5daf0162384a26ec865eb239f9c..edd135914e4b5950eff158d8a5cdd759e52a3225 100644
>--- a/Tools/MobileMiniBrowser/Configurations/Base.xcconfig
>+++ b/Tools/MobileMiniBrowser/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/Scripts/webkitpy/style/checker.py b/Tools/Scripts/webkitpy/style/checker.py
>index f3076501e58cb34c68bb80ebbdf5a5f2ae10e114..47e6bc623b4c0d79a0f35e0ea73ef1417174bbe2 100644
>--- a/Tools/Scripts/webkitpy/style/checker.py
>+++ b/Tools/Scripts/webkitpy/style/checker.py
>@@ -51,6 +51,7 @@ from checkers.jstest import JSTestChecker
> from checkers.messagesin import MessagesInChecker
> from checkers.png import PNGChecker
> from checkers.python import PythonChecker
>+from checkers.sdkvariant import SDKVariantChecker
> from checkers.test_expectations import TestExpectationsChecker
> from checkers.text import TextChecker
> from checkers.watchlist import WatchListChecker
>@@ -416,6 +417,7 @@ def _all_categories():
>     categories = categories.union(ChangeLogChecker.categories)
>     categories = categories.union(PNGChecker.categories)
>     categories = categories.union(FeatureDefinesChecker.categories)
>+    categories = categories.union(SDKVariantChecker.categories)
> 
>     # FIXME: Consider adding all of the pep8 categories.  Since they
>     #        are not too meaningful for documentation purposes, for
>@@ -569,6 +571,7 @@ class FileType:
>     XCODEPROJ = 10
>     CMAKE = 11
>     FEATUREDEFINES = 12
>+    SDKVARIANT = 13
> 
> 
> class CheckerDispatcher(object):
>@@ -656,6 +659,8 @@ class CheckerDispatcher(object):
>             return FileType.TEXT
>         elif os.path.basename(file_path) == "FeatureDefines.xcconfig":
>             return FileType.FEATUREDEFINES
>+        elif os.path.basename(file_path) == "SDKVariant.xcconfig":
>+            return FileType.SDKVARIANT
>         else:
>             return FileType.NONE
> 
>@@ -720,6 +725,8 @@ class CheckerDispatcher(object):
>             checker = WatchListChecker(file_path, handle_style_error)
>         elif file_type == FileType.FEATUREDEFINES:
>             checker = FeatureDefinesChecker(file_path, handle_style_error)
>+        elif file_type == FileType.SDKVARIANT:
>+            checker = SDKVariantChecker(file_path, handle_style_error)
>         else:
>             raise ValueError('Invalid file type "%(file_type)s": the only valid file types '
>                              "are %(NONE)s, %(CPP)s, and %(TEXT)s."
>diff --git a/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py b/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py
>new file mode 100644
>index 0000000000000000000000000000000000000000..8bc62bfef43501f44e44aa4f2600d1980be9ee6c
>--- /dev/null
>+++ b/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py
>@@ -0,0 +1,81 @@
>+# Copyright (C) 2018 Apple Inc. All rights reserved.
>+#
>+# Redistribution and use in source and binary forms, with or without
>+# modification, are permitted provided that the following conditions
>+# are met:
>+# 1.  Redistributions of source code must retain the above copyright
>+#     notice, this list of conditions and the following disclaimer.
>+# 2.  Redistributions in binary form must reproduce the above copyright
>+#     notice, this list of conditions and the following disclaimer in the
>+#     documentation and/or other materials provided with the distribution.
>+#
>+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+
>+"""Supports ensuring equality of SDKVariant.xcconfig files."""
>+
>+import os
>+
>+from webkitpy.common.system.systemhost import SystemHost
>+
>+SDK_VARIANT_FILES = [
>+    "PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig",
>+    "Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig",
>+    "Tools/WebEditingTester/Configurations/SDKVariant.xcconfig",
>+    "Tools/MiniBrowser/Configurations/SDKVariant.xcconfig",
>+    "Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig",
>+    "Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig",
>+    "Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig",
>+    "Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig",
>+    "Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig",
>+    "Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig",
>+    "Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig",
>+    "Source/bmalloc/Configurations/SDKVariant.xcconfig",
>+    "Source/WTF/Configurations/SDKVariant.xcconfig",
>+    "Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig",
>+    "Source/WebInspectorUI/Configurations/SDKVariant.xcconfig",
>+    "Source/WebKit/Configurations/SDKVariant.xcconfig",
>+    "Source/JavaScriptCore/Configurations/SDKVariant.xcconfig",
>+    "Source/WebCore/Configurations/SDKVariant.xcconfig",
>+    "Source/WebCore/PAL/Configurations/SDKVariant.xcconfig",
>+    "Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig",
>+    "Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig",
>+]
>+
>+
>+class SDKVariantChecker(object):
>+    categories = set(['SDKVariant/new', 'SDKVariant/equality'])
>+
>+    def __init__(self, file_path, handle_style_error):
>+        self._file_path = file_path
>+        self._handle_style_error = handle_style_error
>+        self._handle_style_error.turn_off_line_filtering()
>+        self._host = SystemHost()
>+        self._fs = self._host.filesystem
>+
>+    def check(self, inline=None):
>+        if self._file_path not in SDK_VARIANT_FILES:
>+            self._handle_style_error(0, 'SDKVariant/new', 5, "Patch introduces a new SDKVariant.xcconfig, which check-webkit-style doesn't know about. Please add it to the list in SDKVariant.py.")
>+            return
>+
>+        with self._fs.open_binary_file_for_reading(self._file_path) as filehandle:
>+            baseline_content = filehandle.read()
>+
>+        other_SDK_VARIANTs_files = SDK_VARIANT_FILES
>+        other_SDK_VARIANTs_files.remove(self._file_path)
>+
>+        for path in other_SDK_VARIANTs_files:
>+            with self._fs.open_binary_file_for_reading(path) as filehandle:
>+                test_content = filehandle.read()
>+                if baseline_content != test_content:
>+                    self._handle_style_error(0, 'SDKVariant/equality', 5, "Any changes made to SDKVariant should be made to all of them (changed file does not match {0}).".format(path))
>diff --git a/Tools/TestWebKitAPI/Configurations/Base.xcconfig b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>index f0c6a8ae65e6de9d20f4e621d5b67127ed8aa4d7..1b6901984d69f3fef01eed8bc6241ec408116549 100644
>--- a/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -105,16 +106,6 @@ OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
>-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>-
>-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
>-WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
>-
> WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
> WK_COCOA_TOUCH_iphoneos = cocoatouch;
> WK_COCOA_TOUCH_iosmac = cocoatouch;
>diff --git a/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/WebEditingTester/Configurations/Base.xcconfig b/Tools/WebEditingTester/Configurations/Base.xcconfig
>index d848ff82783ab851c67c27249213126a809ae07e..22849c63e2d204b7d70d15b4c922ed279a31ff2e 100644
>--- a/Tools/WebEditingTester/Configurations/Base.xcconfig
>+++ b/Tools/WebEditingTester/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig b/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/WebKitTestRunner/Configurations/Base.xcconfig b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>index 6733d93b6a784901a9a16e50137dd0e5e151bfff..f24036de79b8f9833142f4166d7bf96910e42d42 100644
>--- a/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>+++ b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>@@ -99,10 +100,6 @@ WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
> WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
> WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
> 
>-WK_EMPTY_ = YES;
>-WK_NOT_ = YES;
>-WK_NOT_YES = NO;
>-
> WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
> WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
> WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
>diff --git a/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
>index 8c0e7d8035267b7fe7b472c2c42b0bf6db368d4e..aa1949cf7abcbb5e8a2c07b6a0d915b384159f5e 100644
>--- a/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
>+++ b/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
> #include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
>diff --git a/ChangeLog b/ChangeLog
>index 9af449ddb040f51c84f7cc5ebb56b631eed7fc3c..e2d172620ede030653f065086e137e58f03bff29 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * Makefile.shared:
>+
> 2019-01-18  Philippe Normand  <pnormand@igalia.com>
> 
>         [WPE] Add Qt extension
>diff --git a/Makefile.shared b/Makefile.shared
>index 87e7ad260b9cd98bcd62b80b4b8007acc5c77a96..8116ba4a9f8b81bbb72226137c9b9aa1124d013d 100644
>--- a/Makefile.shared
>+++ b/Makefile.shared
>@@ -34,9 +34,8 @@ ifneq (,$(ARCHS))
> 	endif
> endif
> 
>-ifeq (iosmac,$(SDK_VARIANT))
>-	XCODE_OPTIONS += SDK_VARIANT=iosmac
>-	XCODE_OPTIONS += WK_ALTERNATE_FRAMEWORKS_DIR=/System/iOSSupport
>+ifneq (,$(SDK_VARIANT))
>+	XCODE_OPTIONS += SDK_VARIANT="$(SDK_VARIANT)"
> endif
> 
> DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
>diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
>index d1afbd05678ff56c2f370bc4cd470b84365c1ed1..898d79b206ac70787c68fe6260920058e0409d59 100644
>--- a/PerformanceTests/ChangeLog
>+++ b/PerformanceTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-17  Jer Noble  <jer.noble@apple.com>
>+
>+        SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
>+        https://bugs.webkit.org/show_bug.cgi?id=189553
>+
>+        Reviewed by Tim Horton.
>+
>+        * MediaTime/Configurations/Base.xcconfig:
>+        * MediaTime/Configurations/SDKVariant.xcconfig: Added.
>+
> 2019-01-17  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r240124.
>diff --git a/PerformanceTests/MediaTime/Configurations/Base.xcconfig b/PerformanceTests/MediaTime/Configurations/Base.xcconfig
>index 0dbe8bf0184801883475c9dbd838c2568d899272..4dfdaead5402dafb9b1a81f92653d95b83e2d79e 100644
>--- a/PerformanceTests/MediaTime/Configurations/Base.xcconfig
>+++ b/PerformanceTests/MediaTime/Configurations/Base.xcconfig
>@@ -22,6 +22,7 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> #include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
>+#include "SDKVariant.xcconfig"
> 
> USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
> USE_INTERNAL_SDK_Production = YES;
>diff --git a/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
>new file mode 100644
>index 0000000000000000000000000000000000000000..66140adce25ce311f0aa12da1a4fa41ecc3a32d6
>--- /dev/null
>+++ b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
>@@ -0,0 +1,45 @@
>+// Copyright (C) 2019 Apple Inc. All rights reserved.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+
>+WK_EMPTY_ = YES;
>+WK_NOT_ = YES;
>+WK_NOT_YES = NO;
>+
>+WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
>+WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
>+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
>+
>+WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
>+WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
>+WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
>+
>+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
>+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
>+
>+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
>+WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
>+
>+EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
>+EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);

Actions: View | Formatted Diff | Diff

Attachments on bug 189553: 349561 | 349588 | 349598 | 349606 | 353528 | 353536 | 353552 | 358965 | 359375 | 359526 | 359527