[visionOS] Remove WK_PLATFORM_NAME fallback logic

rdar://127518376 https://bugs.webkit.org/show_bug.cgi?id=273717 Reviewed by Tim Horton. The internal visionOS SDK declares a FALLBACK_PLATFORM_NAME of iphoneos/iphonesimulator. Start ignoring this, so that internal visionOS builds match public SDK builds. Comb through xcconfigs and build scripts and make sure that WK_PLATFORM_NAME logic which recognized iphoneos/iphonesimulator handles xros/xrsimulator. * Configurations/SDKVariant.xcconfig: * PerformanceTests/DecoderTest/Configurations/Base.xcconfig: * PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig: * Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig: * Source/JavaScriptCore/Configurations/libJavaScriptCore.xcconfig: * Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: * Source/JavaScriptCore/Scripts/postprocess-header-rule: * Source/JavaScriptCore/Scripts/process-entitlements.sh: * Source/WebKit/Configurations/BaseTarget.xcconfig: * Source/WebKit/Configurations/BaseXPCService.xcconfig: * Source/WebKit/Configurations/WebKit.xcconfig: Replace an intentional use of PLATFORM_NAME with WK_PLATFORM_NAME, now that it's possible to disambiguate between visionOS and iOS. * Source/WebKit/Configurations/WebKitSwift.xcconfig: * Source/WebKit/Configurations/adattributiond.xcconfig: * Source/WebKit/Scripts/postprocess-header-rule: * Source/WebKit/Scripts/process-entitlements.sh: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: In generate_xcfilelists_lib scripts, use WK_PLATFORM_NAME and declare support for xros/xrsimulator platforms. * Source/WebKitLegacy/scripts/check-xcfilelists.sh: * Tools/DumpRenderTree/Scripts/check-xcfilelists.sh: * Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py: (JavaScriptCoreGenerator): (WebCoreGenerator): (WebKitGenerator): (WebKitLegacyGenerator): (TestWebKitAPIGenerator): * Tools/TestWebKitAPI/Scripts/check-xcfilelists.sh: * Tools/WebKitTestRunner/Scripts/check-xcfilelists.sh: Canonical link: https://commits.webkit.org/278812@main
WebKit · May 15, 2024 · 9088dd2 · 9088dd2
1 parent 3fd7303
commit 9088dd2
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 18 deletions.
diff --git a/Configurations/SDKVariant.xcconfig b/Configurations/SDKVariant.xcconfig
@@ -54,6 +54,7 @@ USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_[sdk=xr*.internal] = $(PLATFORM_NAME);
 
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;

diff --git a/PerformanceTests/DecoderTest/Configurations/Base.xcconfig b/PerformanceTests/DecoderTest/Configurations/Base.xcconfig
@@ -135,6 +135,8 @@ WK_COCOA_TOUCH_watchos = cocoatouch;
 WK_COCOA_TOUCH_watchsimulator = cocoatouch;
 WK_COCOA_TOUCH_appletvos = cocoatouch;
 WK_COCOA_TOUCH_appletvsimulator = cocoatouch;
+WK_COCOA_TOUCH_xros = cocoatouch;
+WK_COCOA_TOUCH_xrsimulator = cocoatouch;
 WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
 
 LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));

diff --git a/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig b/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
@@ -39,6 +39,7 @@ WK_OR_YES_YES = YES
 WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
 WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
 WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_[sdk=xr*.internal] = $(PLATFORM_NAME);
 
 WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
 WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;

diff --git a/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
@@ -40,6 +40,8 @@ WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_TVOS_SINCE_17 = YES;
 WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_watchos = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_WATCHOS_10));
 WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_watchsimulator = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_WATCHOS_10));
 WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_WATCHOS_SINCE_10 = YES;
+WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_xros = YES;
+WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_xrsimulator = YES;
 
 SUPPORTS_TEXT_BASED_API = $(WK_AND_$(TAPI_USE_SRCROOT)_$(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS));
 TAPI_USE_SRCROOT = $(TAPI_USE_SRCROOT$(WK_XCODE_15));

diff --git a/Source/JavaScriptCore/Configurations/libJavaScriptCore.xcconfig b/Source/JavaScriptCore/Configurations/libJavaScriptCore.xcconfig
@@ -30,8 +30,10 @@ WK_COMPRESSED_OPTIMIZATION_PROFILE_FILE_YES = $(WK_WEBKITADDITIONS_HEADERS_FOLDE
 CLANG_USE_OPTIMIZATION_PROFILE = $(CLANG_USE_OPTIMIZATION_PROFILE_$(USE_INTERNAL_SDK)_$(CONFIGURATION)_$(WK_PLATFORM_NAME));
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Release_macosx = YES;
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Release_iphoneos = YES;
+CLANG_USE_OPTIMIZATION_PROFILE_YES_Release_xros = YES;
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Production_macosx = YES;
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Production_iphoneos = YES;
+CLANG_USE_OPTIMIZATION_PROFILE_YES_Production_xros = YES;
 
 SKIP_INSTALL = YES;
 

diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -12344,7 +12344,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
-			shellScript = "if [[ ${FALLBACK_PLATFORM_NAME:-$PLATFORM_NAME} != \"iphoneos\" ]]; then\n    exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"\n";
+			shellScript = "if [[ ${WK_PLATFORM_NAME} != \"iphoneos\" ]] && [[ ${WK_PLATFORM_NAME} != \"xros\" ]]; then\n    exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"\n";
 		};
 		3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
 			isa = PBXShellScriptBuildPhase;

diff --git a/Source/JavaScriptCore/Scripts/process-entitlements.sh b/Source/JavaScriptCore/Scripts/process-entitlements.sh
@@ -173,7 +173,8 @@ then
     fi
 elif [[ "${WK_PLATFORM_NAME}" == iphoneos ||
         "${WK_PLATFORM_NAME}" == appletvos ||
-        "${WK_PLATFORM_NAME}" == watchos ]]
+        "${WK_PLATFORM_NAME}" == watchos ||
+        "${WK_PLATFORM_NAME}" == xros ]]
 then
     if [[ "${PRODUCT_NAME}" == jsc ||
           "${PRODUCT_NAME}" == dynbench ||

diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
@@ -50,8 +50,10 @@ WK_COMPRESSED_OPTIMIZATION_PROFILE_FILE_YES = $(WK_WEBKITADDITIONS_HEADERS_FOLDE
 CLANG_USE_OPTIMIZATION_PROFILE = $(CLANG_USE_OPTIMIZATION_PROFILE_$(USE_INTERNAL_SDK)_$(CONFIGURATION)_$(WK_PLATFORM_NAME));
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Release_macosx = YES;
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Release_iphoneos = YES;
+CLANG_USE_OPTIMIZATION_PROFILE_YES_Release_xros = YES;
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Production_macosx = YES;
 CLANG_USE_OPTIMIZATION_PROFILE_YES_Production_iphoneos = YES;
+CLANG_USE_OPTIMIZATION_PROFILE_YES_Production_xros = YES;
 
 CLANG_INSTRUMENT_FOR_OPTIMIZATION_PROFILING = $(CLANG_INSTRUMENT_FOR_OPTIMIZATION_PROFILING_$(ENABLE_LLVM_PROFILE_GENERATION));
 CLANG_INSTRUMENT_FOR_OPTIMIZATION_PROFILING_ENABLE_LLVM_PROFILE_GENERATION = YES;

diff --git a/Source/WebKit/Configurations/BaseXPCService.xcconfig b/Source/WebKit/Configurations/BaseXPCService.xcconfig
@@ -100,6 +100,7 @@ WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_maccatalyst = $(WK_LIBRARY_VALIDATION_CODE
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iphoneos = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily);
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_appletvos = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily);
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_watchos = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily);
+WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_xros = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily);
 
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_$(WK_XPC_SERVICE_VARIANT)) --entitlements $(WK_PROCESSED_XCENT_FILE);
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_ = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_Normal);

diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
@@ -144,10 +144,7 @@ WK_SECURITY_INTERFACE_LDFLAGS_macosx = -framework SecurityInterface;
 WK_UIKIT_LDFLAGS = $(WK_UIKIT_LDFLAGS_$(WK_COCOA_TOUCH));
 WK_UIKIT_LDFLAGS_cocoatouch = -framework UIKit;
 
-// This intentionally uses PLATFORM_NAME instead of WK_PLATFORM_NAME, because
-// it's impossible to tell the difference between visionOS and iOS with the latter.
-// Don't copy this unless you also need to differentiate!
-WK_MRUIKIT_LDFLAGS = $(WK_MRUIKIT_LDFLAGS_$(PLATFORM_NAME));
+WK_MRUIKIT_LDFLAGS = $(WK_MRUIKIT_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_MRUIKIT_LDFLAGS_xros = -weak_framework MRUIKit;
 WK_MRUIKIT_LDFLAGS_xrsimulator = -weak_framework MRUIKit;
 
@@ -324,6 +321,8 @@ WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
 WK_HAVE_URL_FORMATTING_iphoneos = YES;
 WK_HAVE_URL_FORMATTING_maccatalyst = YES;
 WK_HAVE_URL_FORMATTING_iphonesimulator = YES;
+WK_HAVE_URL_FORMATTING_xros = YES;
+WK_HAVE_URL_FORMATTING_xrsimulator = YES;
 WK_HAVE_URL_FORMATTING_watchos = YES;
 WK_HAVE_URL_FORMATTING_watchsimulator = YES;
 WK_HAVE_URL_FORMATTING_appletvos = NO
@@ -334,5 +333,6 @@ WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
 WK_TRACE_POINTS_OUTPUT_PATH = $(WK_TRACE_POINTS_OUTPUT_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)_$(WK_PLATFORM_NAME));
 WK_TRACE_POINTS_OUTPUT_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_macosx = $(DSTROOT)/AppleInternal/Library/Ariadne/Plists/WebKit.plist;
 WK_TRACE_POINTS_OUTPUT_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_iphoneos = $(DSTROOT)/AppleInternal/Library/Ariadne/Plists/WebKit.plist;
+WK_TRACE_POINTS_OUTPUT_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO_xros = $(DSTROOT)/AppleInternal/Library/Ariadne/Plists/WebKit.plist;
 
 SWIFT_INSTALL_OBJC_HEADER = NO
diff --git a/Source/WebKit/Configurations/WebKitSwift.xcconfig b/Source/WebKit/Configurations/WebKitSwift.xcconfig
@@ -41,6 +41,7 @@ WK_EXCLUDED_COORDINATOR_FILES_YES_YES = WKGroupSession.swift
 WK_HAVE_MARKETPLACE_KIT = $(WK_HAVE_MARKETPLACE_KIT_$(WK_PLATFORM_NAME));
 WK_HAVE_MARKETPLACE_KIT_iphoneos = $(WK_HAVE_MARKETPLACE_KIT$(WK_IOS_17));
 WK_HAVE_MARKETPLACE_KIT_IOS_SINCE_17 = YES;
+WK_HAVE_MARKETPLACE_KIT_xros = YES;
 
 WK_EXCLUDED_MARKETPLACE_KIT_WRAPPER_FILES = $(WK_EXCLUDED_MARKETPLACE_KIT_WRAPPER_FILES_$(WK_AND_$(USE_INTERNAL_SDK)_$(WK_HAVE_MARKETPLACE_KIT)));
 WK_EXCLUDED_MARKETPLACE_KIT_WRAPPER_FILES_NO = MarketplaceKitWrapper.swift;

diff --git a/Source/WebKit/Configurations/adattributiond.xcconfig b/Source/WebKit/Configurations/adattributiond.xcconfig
@@ -40,6 +40,7 @@ WK_PROCESSED_XCENT_FILE=$(TEMP_FILE_DIR)/$(FULL_PRODUCT_NAME).entitlements
 
 WK_CODE_SIGN_FLAGS = $(WK_CODE_SIGN_FLAGS_$(WK_PLATFORM_NAME));
 WK_CODE_SIGN_FLAGS_iphoneos = --entitlements $(WK_PROCESSED_XCENT_FILE);
+WK_CODE_SIGN_FLAGS_xros = --entitlements $(WK_PROCESSED_XCENT_FILE);
 OTHER_CODE_SIGN_FLAGS = $(WK_CODE_SIGN_FLAGS);
 
 FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR)

diff --git a/Source/WebKit/Scripts/postprocess-header-rule b/Source/WebKit/Scripts/postprocess-header-rule
@@ -57,7 +57,7 @@ if [[ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
         else
             [[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
         fi
-    elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then
+    elif [[ "${WK_PLATFORM_NAME}" =~ "iphone" ]]; then
         [[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}
         [[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
         [[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"

diff --git a/Source/WebKit/Scripts/process-entitlements.sh b/Source/WebKit/Scripts/process-entitlements.sh
@@ -614,7 +614,8 @@ then
     fi
 elif [[ "${WK_PLATFORM_NAME}" == iphoneos ||
         "${WK_PLATFORM_NAME}" == appletvos ||
-        "${WK_PLATFORM_NAME}" == watchos ]]
+        "${WK_PLATFORM_NAME}" == watchos ||
+        "${WK_PLATFORM_NAME}" == xros ]]
 then
     if [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent.Development ]]; then true
     elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebContent ]]; then ios_family_process_webcontent_entitlements

diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -18178,7 +18178,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
-			shellScript = "if [[ ${WK_PLATFORM_NAME} != \"iphoneos\" && ${WK_PLATFORM_NAME} != \"maccatalyst\" ]]; then\n    exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${WK_ALTERNATE_FRAMEWORKS_DIR}${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${WK_ALTERNATE_FRAMEWORKS_DIR}${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/WebKit.framework \"${INSTALL_ROOT}/${WK_ALTERNATE_FRAMEWORKS_DIR}${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\"\n";
+			shellScript = "if [[ ${WK_PLATFORM_NAME} != \"iphoneos\" && ${WK_PLATFORM_NAME} != \"xros\" && ${WK_PLATFORM_NAME} != \"maccatalyst\" ]]; then\n    exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${WK_ALTERNATE_FRAMEWORKS_DIR}${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${WK_ALTERNATE_FRAMEWORKS_DIR}${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/WebKit.framework \"${INSTALL_ROOT}/${WK_ALTERNATE_FRAMEWORKS_DIR}${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/WebKit.framework\"\n";
 		};
 		2D56C1CA28A367A00081BD25 /* Unlock keychain */ = {
 			isa = PBXShellScriptBuildPhase;

diff --git a/Source/WebKitLegacy/scripts/check-xcfilelists.sh b/Source/WebKitLegacy/scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebKitLegacy --platform "${FALLBACK_PLATFORM_NAME:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebKitLegacy --platform "${WK_PLATFORM_NAME}" --configuration "${CONFIGURATION}"
diff --git a/Tools/DumpRenderTree/Scripts/check-xcfilelists.sh b/Tools/DumpRenderTree/Scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project DumpRenderTree --platform "${FALLBACK_PLATFORM_NAME:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project DumpRenderTree --platform "${WK_PLATFORM_NAME}" --configuration "${CONFIGURATION}"
diff --git a/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py b/Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py
@@ -726,7 +726,7 @@ def _get_temp_dir(self):
 
 
 class JavaScriptCoreGenerator(BaseGenerator):
-    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
     VALID_CONFIGURATIONS = ("Debug", "Release", "Production", "Profiling")
 
     @util.LogEntryExit
@@ -743,7 +743,7 @@ def _get_generate_unified_sources_script(self):
 
 
 class WebCoreGenerator(BaseGenerator):
-    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
     VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
 
     @util.LogEntryExit
@@ -760,7 +760,7 @@ def _get_generate_unified_sources_script(self):
 
 
 class WebKitGenerator(BaseGenerator):
-    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
     VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
 
     @util.LogEntryExit
@@ -781,7 +781,7 @@ def _get_generate_unified_sources_script(self):
 
 
 class WebKitLegacyGenerator(BaseGenerator):
-    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
     VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
 
     @util.LogEntryExit
@@ -820,7 +820,7 @@ def _get_generate_derived_sources_script(self):
 
 
 class TestWebKitAPIGenerator(BaseGenerator):
-    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator")
+    VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
     VALID_CONFIGURATIONS = ("Debug", "Release", "Production")
 
     @util.LogEntryExit

diff --git a/Tools/TestWebKitAPI/Scripts/check-xcfilelists.sh b/Tools/TestWebKitAPI/Scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project TestWebKitAPI --platform "${FALLBACK_PLATFORM_NAME:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project TestWebKitAPI --platform "${WK_PLATFORM_NAME}" --configuration "${CONFIGURATION}"
diff --git a/Tools/WebKitTestRunner/Scripts/check-xcfilelists.sh b/Tools/WebKitTestRunner/Scripts/check-xcfilelists.sh
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebKitTestRunner --platform "${FALLBACK_PLATFORM_NAME:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebKitTestRunner --platform "${WK_PLATFORM_NAME}" --configuration "${CONFIGURATION}"