Title: [262650] trunk/Source/WebCore
- Revision
- 262650
- Author
- jbed...@apple.com
- Date
- 2020-06-05 13:40:22 -0700 (Fri, 05 Jun 2020)
Log Message
WebCore: Link to framework stubs for watchOS and tvOS
https://bugs.webkit.org/show_bug.cgi?id=212834
<rdar://problem/64033712>
Reviewed by Tim Horton.
No new tests, no behavior changed.
* Configurations/Base.xcconfig: Ignore 64 to 32 bit conversion errors for watchOS
simulators, add tvOS and watchOS major version macros.
* Configurations/WebCore.xcconfig: Link to framework stubs for watchOS and tvOS.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (262649 => 262650)
--- trunk/Source/WebCore/ChangeLog 2020-06-05 20:15:51 UTC (rev 262649)
+++ trunk/Source/WebCore/ChangeLog 2020-06-05 20:40:22 UTC (rev 262650)
@@ -1,3 +1,17 @@
+2020-06-05 Jonathan Bedard <jbed...@apple.com>
+
+ WebCore: Link to framework stubs for watchOS and tvOS
+ https://bugs.webkit.org/show_bug.cgi?id=212834
+ <rdar://problem/64033712>
+
+ Reviewed by Tim Horton.
+
+ No new tests, no behavior changed.
+
+ * Configurations/Base.xcconfig: Ignore 64 to 32 bit conversion errors for watchOS
+ simulators, add tvOS and watchOS major version macros.
+ * Configurations/WebCore.xcconfig: Link to framework stubs for watchOS and tvOS.
+
2020-06-05 David Kilzer <ddkil...@apple.com>
[IPC] Adopt enum class for PluginLoadClientPolicy
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (262649 => 262650)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2020-06-05 20:15:51 UTC (rev 262649)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2020-06-05 20:40:22 UTC (rev 262650)
@@ -76,6 +76,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
// FIXME: <http://webkit.org/b/109846> WebCore should build with -Wshorten-64-to-32
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=i386] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64*] = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -97,7 +98,9 @@
TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600;
TARGET_MAC_OS_X_VERSION_MAJOR_17 = 101700;
-WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
+WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
+WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
+WK_TARGET_WATCHOS_VERSION_MAJOR = $(WATCHOS_DEPLOYMENT_TARGET:base);
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (262649 => 262650)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2020-06-05 20:15:51 UTC (rev 262649)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2020-06-05 20:40:22 UTC (rev 262650)
@@ -30,11 +30,12 @@
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) BUILDING_WEBKIT GL_SILENCE_DEPRECATION=1 GLES_SILENCE_DEPRECATION=1 $(inherited);
WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=macos*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(TARGET_MAC_OS_X_VERSION_MAJOR);
WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=appletv*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/appletvos/$(WK_TARGET_TVOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=watch*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/watchos/$(WK_TARGET_WATCHOS_VERSION_MAJOR);
-FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
+FRAMEWORK_SEARCH_PATHS[sdk=embedded*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
