Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (259825 => 259826)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-04-09 20:51:59 UTC (rev 259826)
@@ -1,3 +1,26 @@
+2020-04-09 Keith Rollin <[email protected]>
+
+ Set ENTITLEMENTS_REQUIRED=NO for some Xcode build targets
+ https://bugs.webkit.org/show_bug.cgi?id=210250
+ <rdar://problem/61502270>
+
+ Reviewed by Jonathan Bedard.
+
+ When building with the public version of Xcode 11.4, with XCBuild
+ enabled, and targeting the iOS device, some build targets issue an
+ error like:
+
+ error: An empty identity is not valid when signing a binary for
+ the product type 'Command-line Tool'. (in target 'yasm' from
+ project 'libwebrtc')
+
+ A comment in <rdar://problem/47092353> suggests setting
+ ENTITLEMENTS_REQUIRED=NO to relax the requirement. To that end, when
+ building with the public Xcode, establish that setting for the
+ affected targets.
+
+ * Configurations/Base.xcconfig:
+
2020-04-08 Truitt Savell <[email protected]>
Unreviewed, reverting r259708.
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (259825 => 259826)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -61,6 +61,11 @@
STRIP_INSTALLED_PRODUCT = NO;
WARNING_CFLAGS = -Wexit-time-destructors -Wglobal-constructors -Wthread-safety;
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
+
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
VALID_ARCHS = $(ARCHS_STANDARD_64_BIT);
Modified: trunk/Source/WebCore/ChangeLog (259825 => 259826)
--- trunk/Source/WebCore/ChangeLog 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebCore/ChangeLog 2020-04-09 20:51:59 UTC (rev 259826)
@@ -1,3 +1,29 @@
+2020-04-09 Keith Rollin <[email protected]>
+
+ Set ENTITLEMENTS_REQUIRED=NO for some Xcode build targets
+ https://bugs.webkit.org/show_bug.cgi?id=210250
+ <rdar://problem/61502270>
+
+ Reviewed by Jonathan Bedard.
+
+ When building with the public version of Xcode 11.4, with XCBuild
+ enabled, and targeting the iOS device, some build targets issue an
+ error like:
+
+ error: An empty identity is not valid when signing a binary for
+ the product type 'Command-line Tool'. (in target 'yasm' from
+ project 'libwebrtc')
+
+ A comment in <rdar://problem/47092353> suggests setting
+ ENTITLEMENTS_REQUIRED=NO to relax the requirement. To that end, when
+ building with the public Xcode, establish that setting for the
+ affected targets.
+
+ No new tests -- no changed functionality.
+
+ * Configurations/WebCoreTestShim.xcconfig:
+ * Configurations/WebCoreTestSupport.xcconfig:
+
2020-04-09 Rob Buis <[email protected]>
Remove FrameLoader::outgoingOrigin
Modified: trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig (259825 => 259826)
--- trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -43,3 +43,8 @@
EXPORTED_SYMBOLS_FILE = ;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
OTHER_LDFLAGS[sdk=macosx*] = $(ASAN_OTHER_LDFLAGS) -framework Carbon;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (259825 => 259826)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -62,3 +62,8 @@
OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS);
OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility $(LIBWEBRTC_LDFLAGS);
SECT_ORDER_FLAGS = ;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebKit/ChangeLog (259825 => 259826)
--- trunk/Source/WebKit/ChangeLog 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebKit/ChangeLog 2020-04-09 20:51:59 UTC (rev 259826)
@@ -1,3 +1,31 @@
+2020-04-09 Keith Rollin <[email protected]>
+
+ Set ENTITLEMENTS_REQUIRED=NO for some Xcode build targets
+ https://bugs.webkit.org/show_bug.cgi?id=210250
+ <rdar://problem/61502270>
+
+ Reviewed by Jonathan Bedard.
+
+ When building with the public version of Xcode 11.4, with XCBuild
+ enabled, and targeting the iOS device, some build targets issue an
+ error like:
+
+ error: An empty identity is not valid when signing a binary for
+ the product type 'Command-line Tool'. (in target 'yasm' from
+ project 'libwebrtc')
+
+ A comment in <rdar://problem/47092353> suggests setting
+ ENTITLEMENTS_REQUIRED=NO to relax the requirement. To that end, when
+ building with the public Xcode, establish that setting for the
+ affected targets.
+
+ * Configurations/GPUService.xcconfig:
+ * Configurations/NetworkService.xcconfig:
+ * Configurations/PluginProcessShim.xcconfig:
+ * Configurations/PluginService.64.xcconfig:
+ * Configurations/SecItemShim.xcconfig:
+ * Configurations/WebContentService.xcconfig:
+
2020-04-09 Jacob Uphoff <[email protected]>
Unreviewed, reverting r259816.
Modified: trunk/Source/WebKit/Configurations/GPUService.xcconfig (259825 => 259826)
--- trunk/Source/WebKit/Configurations/GPUService.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebKit/Configurations/GPUService.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -29,3 +29,8 @@
INFOPLIST_FILE[sdk=macosx*] = GPUProcess/EntryPoint/Cocoa/XPCService/GPUService/Info-OSX.plist;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebKit/Configurations/NetworkService.xcconfig (259825 => 259826)
--- trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -30,3 +30,8 @@
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig (259825 => 259826)
--- trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -35,3 +35,8 @@
WK_QUARTZCORE_LDFLAGS_macosx = -framework QuartzCore;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_QUARTZCORE_LDFLAGS);
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebKit/Configurations/PluginService.64.xcconfig (259825 => 259826)
--- trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebKit/Configurations/PluginService.64.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -38,3 +38,8 @@
WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS[sdk=macosx*] = --entitlements $(WK_PROCESSED_XCENT_FILE);
SKIP_INSTALL[sdk=iphone*] = YES;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebKit/Configurations/SecItemShim.xcconfig (259825 => 259826)
--- trunk/Source/WebKit/Configurations/SecItemShim.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebKit/Configurations/SecItemShim.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -27,3 +27,8 @@
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (259825 => 259826)
--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -50,3 +50,8 @@
RUNLOOP_TYPE = $(RUNLOOP_TYPE$(WK_MACOS_1014));
RUNLOOP_TYPE_MACOS_BEFORE_1014 = _NSApplicationMain;
RUNLOOP_TYPE_MACOS_SINCE_1014 = _WebKit;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Tools/ChangeLog (259825 => 259826)
--- trunk/Tools/ChangeLog 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Tools/ChangeLog 2020-04-09 20:51:59 UTC (rev 259826)
@@ -1,3 +1,32 @@
+2020-04-09 Keith Rollin <[email protected]>
+
+ Set ENTITLEMENTS_REQUIRED=NO for some Xcode build targets
+ https://bugs.webkit.org/show_bug.cgi?id=210250
+ <rdar://problem/61502270>
+
+ Reviewed by Jonathan Bedard.
+
+ When building with the public version of Xcode 11.4, with XCBuild
+ enabled, and targeting the iOS device, some build targets issue an
+ error like:
+
+ error: An empty identity is not valid when signing a binary for
+ the product type 'Command-line Tool'. (in target 'yasm' from
+ project 'libwebrtc')
+
+ A comment in <rdar://problem/47092353> suggests setting
+ ENTITLEMENTS_REQUIRED=NO to relax the requirement. To that end, when
+ building with the public Xcode, establish that setting for the
+ affected targets.
+
+ With this change, we can also remove
+ IDEProvisioningProfileSupportRelaxed=YES from webkitdirs.pm.
+
+ * Scripts/webkitdirs.pm:
+ (XcodeOptions):
+ * TestWebKitAPI/Configurations/TestWTF.xcconfig:
+ * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
+
2020-04-09 Wenson Hsieh <[email protected]>
Add an API test for <https://trac.webkit.org/r259766>
Modified: trunk/Tools/Scripts/webkitdirs.pm (259825 => 259826)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-04-09 20:51:59 UTC (rev 259826)
@@ -914,7 +914,6 @@
die "cannot enable both ASAN and Coverage at this time\n" if $coverageIsEnabled && $asanIsEnabled;
if (willUseIOSDeviceSDK() || willUseWatchDeviceSDK() || willUseAppleTVDeviceSDK()) {
- push @options, "-IDEProvisioningProfileSupportRelaxed=YES";
push @options, "ENABLE_BITCODE=NO";
if (hasIOSDevelopmentCertificate()) {
# FIXME: May match more than one installed development certificate.
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig (259825 => 259826)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -38,3 +38,8 @@
OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework CoreGraphics;
STRIP_STYLE = debugging;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (259825 => 259826)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2020-04-09 20:51:22 UTC (rev 259825)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2020-04-09 20:51:59 UTC (rev 259826)
@@ -80,3 +80,8 @@
CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
INFOPLIST_FILE = $(SRCROOT)/Info.plist;
+
+ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_NO = NO;
+ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
