Build for visionOS using the public SDK #28112
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emw-apple
added
the
Tools / Tests
|
EWS run on previous version of this PR (hash 4017796) |
hortont424
approved these changes
May 3, 2024
webkit-ews-buildbot
added
the
merging-blocked
emw-apple
removed
the
merging-blocked
emw-apple
force-pushed
the
eng/visionos-build
branch
from
4017796
to
81dd3ca
Compare
|
EWS run on current version of this PR (hash 81dd3ca) |
🛠 tv-sim
aproskuryakov
approved these changes
May 3, 2024
| @@ -1014,7 +1014,7 @@ | |||
| #define ENABLE_WINDOW_PROXY_PROPERTY_ACCESS_NOTIFICATION 1 | |||
| #endif | |||
|
|
|||
| #if !defined(ENABLE_MODEL_PROCESS) && PLATFORM(VISION) | |||
| #if !defined(ENABLE_MODEL_PROCESS) && PLATFORM(VISION) && USE(APPLE_INTERNAL_SDK) | |||
There was a problem hiding this comment.
This probably needs a bug to track enabling.
| @@ -196,6 +200,7 @@ SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,WebCore.order; | |||
|
|
|||
| EXCLUDED_SOURCE_FILE_NAMES = pdfjs*/*; | |||
| EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(inherited) *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h; | |||
| EXCLUDED_SOURCE_FILE_NAMES[sdk=xr*] = $(inherited) *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h; | |||
There was a problem hiding this comment.
We still have the np files?!
There was a problem hiding this comment.
Doesn't look like we do. These names were just left behind from the headers were removed in 2021 in https://commits.webkit.org/243690@main.
https://bugs.webkit.org/show_bug.cgi?id=273517 rdar://problem/127315794 Reviewed by Tim Horton and Alexey Proskuryakov. WebKit has built for visionOS for a long time, but relies on some internal-only idioms that must be changed for public SDK compatibility: - The public visionOS SDK does not fall back to iphoneos/iphonesimulator property conditions, so we need to add "[sdk=xr*]" clauses and handle a WK_PLATFORM_NAME of xros/xrsimulator in xcconfigs. - TARGET_OS_IOS is not true, so a number of #if guards need to be updated to include TARGET_OS_VISION when it is available. Beyond that, add needed SPI declarations, similar to any other embedded platform update. * Configurations/SDKVariant.xcconfig: * Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/libaom.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig: * Source/WTF/wtf/PlatformEnableCocoa.h: SEPARATED_MODEL and MODEL_PROCESS features currently only build with WebKitAdditions, so temporarily disable them in the public build. * Source/WTF/wtf/PlatformHave.h: - HAVE_LOCKDOWN_MODE_PDF_ADDITIONS: This was never enabled in internal builds, turn it off publicly. - HAVE_CORE_TELEPHONY: It's a nominally public framework but stripped from the public SDK. Rather than hack it back into place, disable the feature since it is minimally used for autofill. - HAVE_BROWSER_ENGINE_SUPPORTING_API: Only needed in public builds, so the PLATFORM(VISION) clause was missing until now. * Source/WebCore/Configurations/FeatureDefines.xcconfig: * Source/WebCore/Configurations/WebCore.xcconfig: * Source/WebCore/Configurations/WebCoreTestSupport.xcconfig: * Source/WebCore/PAL/Configurations/PAL.xcconfig: * Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h: * Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h: * Source/WebCore/PAL/pal/spi/ios/MobileGestaltSPI.h: * Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h: * Source/WebCore/platform/ios/WebItemProviderPasteboard.h: * Source/WebKit/Configurations/FeatureDefines.xcconfig: * Source/WebKit/Configurations/WebKit.xcconfig: * Source/WebKit/Platform/spi/Cocoa/AuthenticationServicesCoreSPI.h: * Source/WebKit/Platform/spi/visionos/RealitySystemSupportSPI.h: Added. * Source/WebKit/Shared/API/Cocoa/_WKHitTestResult.h: * Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h: * Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h: Drive-by removal of some outdated version checks. * Source/WebKit/UIProcess/API/Cocoa/WKWebView.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h: * Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h: Drive-by remove a defined(TARGET_OS_IOS) check, to make the preprocessor conditional easier to write. This file already requires TargetConditionals.h to be included, and TARGET_OS_IOS has existed for many years. * Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm: Ditto. * Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeInteractionRegionLayers.mm: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKitLegacy/mac/WebView/WebUIDelegatePrivate.h: * Source/WebKitLegacy/mac/WebView/WebViewPrivate.h: * Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: * Tools/TestWebKitAPI/Configurations/WebProcessPlugIn.xcconfig: Check in TBD stubs for private frameworks, generated by extract-tbds-from-internal-sdk. * WebKitLibraries/SDKs/xros1.0-additions.sdk/SDKSettings.plist: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/SymlinkedHeaders-output.xcfilelist: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/SymlinkedHeaders.xcfilelist: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/AppServerSupport.framework/AppServerSupport.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/AppStoreDaemon.framework/AppStoreDaemon.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/ApplePushService.framework/ApplePushService.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/CorePrediction.framework/CorePrediction.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/CoreRE.framework/CoreRE.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/FontServices.framework/libFontParser.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/FrontBoardServices.framework/FrontBoardServices.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/GraphicsServices.framework/GraphicsServices.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/IOSurfaceAccelerator.framework/IOSurfaceAccelerator.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/IconServices.framework/IconServices.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/IdleTimerServices.framework/IdleTimerServices.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/InstallCoordination.framework/InstallCoordination.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/LinearMediaKit.framework/LinearMediaKit.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/MRUIKit.framework/MRUIKit.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/MobileKeyBag.framework/MobileKeyBag.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/PrototypeTools.framework/PrototypeTools.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/RunningBoardServices.framework/RunningBoardServices.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/SafariSafeBrowsing.framework/SafariSafeBrowsing.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/URLFormatting.framework/URLFormatting.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/System/Library/PrivateFrameworks/VisionKitCore.framework/VisionKitCore.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/usr/lib/swift/libswiftXPC.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/usr/lib/xr/libRuntimeSupport.tbd: Added. * WebKitLibraries/SDKs/xros1.0-additions.sdk/usr/local/include/AvailabilityProhibitedInternal.h: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/SDKSettings.plist: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/SymlinkedHeaders-output.xcfilelist: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/SymlinkedHeaders.xcfilelist: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/AppServerSupport.framework/AppServerSupport.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/AppStoreDaemon.framework/AppStoreDaemon.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/ApplePushService.framework/ApplePushService.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/CorePrediction.framework/CorePrediction.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/CoreRE.framework/CoreRE.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/FontServices.framework/libFontParser.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/FrontBoardServices.framework/FrontBoardServices.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/GraphicsServices.framework/GraphicsServices.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/IconServices.framework/IconServices.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/IdleTimerServices.framework/IdleTimerServices.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/InstallCoordination.framework/InstallCoordination.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/LinearMediaKit.framework/LinearMediaKit.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/MRUIKit.framework/MRUIKit.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/PrototypeTools.framework/PrototypeTools.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/RunningBoardServices.framework/RunningBoardServices.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/SafariSafeBrowsing.framework/SafariSafeBrowsing.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/URLFormatting.framework/URLFormatting.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/System/Library/PrivateFrameworks/VisionKitCore.framework/VisionKitCore.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/usr/lib/swift/libswiftGLKit.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/usr/lib/swift/libswiftXPC.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/usr/lib/xr/libRuntimeSupport.tbd: Added. * WebKitLibraries/SDKs/xrsimulator1.0-additions.sdk/usr/local/include/AvailabilityProhibitedInternal.h: Added. Canonical link: https://commits.webkit.org/278405@main
webkit-commit-queue
force-pushed
the
eng/visionos-build
branch
from
81dd3ca
to
9c7eb63
Compare
|
Committed 278405@main (9c7eb63): https://commits.webkit.org/278405@main Reviewed commits have been landed. Closing PR #28112 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
9c7eb63
81dd3ca