Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (263309 => 263310)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2020-06-20 02:26:14 UTC (rev 263309)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2020-06-20 02:37:03 UTC (rev 263310)
@@ -250,7 +250,7 @@
},
{
"name": "Apple-watchOS-6-Release-Build", "type": "Build", "builddir": "watchos-13-release",
- "platform": "watchos-6", "configuration": "release", "architectures": ["arm64"],
+ "platform": "watchos-6", "configuration": "release", "architectures": ["arm64_32"],
"slavenames": ["bot609"]
},
{
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (263309 => 263310)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2020-06-20 02:26:14 UTC (rev 263309)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2020-06-20 02:37:03 UTC (rev 263310)
@@ -55,7 +55,7 @@
"Apple iPadOS 13 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS13Simulator, heading:"iPadOS Debug", debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
"Apple-tvOS-13-Release-Build": {platform: Dashboard.Platform.tvOS13Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"Apple-tvOS-Simulator-13-Release-Build": {platform: Dashboard.Platform.tvOS13Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
- "Apple-watchOS-6-Release-Build": {platform: Dashboard.Platform.watchOS6Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+ "Apple-watchOS-6-Release-Build": {platform: Dashboard.Platform.watchOS6Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
"Apple-watchOS-Simulator-6-Release-Build": {platform: Dashboard.Platform.watchOS6Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
"Apple Win 10 Debug (Build)": {platform: Dashboard.Platform.Windows10, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit },
"Apple Win 10 Release (Build)": {platform: Dashboard.Platform.Windows10, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
Modified: trunk/Tools/ChangeLog (263309 => 263310)
--- trunk/Tools/ChangeLog 2020-06-20 02:26:14 UTC (rev 263309)
+++ trunk/Tools/ChangeLog 2020-06-20 02:37:03 UTC (rev 263310)
@@ -1,3 +1,18 @@
+2020-06-19 Jonathan Bedard <jbed...@apple.com>
+
+ Bring up watchOS/tvOS on build.webkit.org (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=213402
+ <rdar://problem/64542588>
+
+ Unreviewed build-fix.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json: Use arm64_32 to build watchOS device.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ (WebKitBuildbot): watchOS device should be considered 32 bit.
+ * Scripts/configure-xcode-for-embedded-development: Force-copy MediaAccessibility.framework.
+ * Scripts/webkitdirs.pm:
+ (extractNonMacOSHostConfiguration): Native Macs never use 32 bit tool binaries.
+
2020-06-19 Aakash Jain <aakash_j...@apple.com>
Delete dead code for old ews api tests
Modified: trunk/Tools/Scripts/configure-xcode-for-embedded-development (263309 => 263310)
--- trunk/Tools/Scripts/configure-xcode-for-embedded-development 2020-06-20 02:26:14 UTC (rev 263309)
+++ trunk/Tools/Scripts/configure-xcode-for-embedded-development 2020-06-20 02:37:03 UTC (rev 263310)
@@ -56,7 +56,7 @@
("IOKit.framework", True),
("IOSurface.framework", True),
("LocalAuthentication.framework", False),
- ("MediaAccessibility.framework", False),
+ ("MediaAccessibility.framework", True),
("MediaToolbox.framework", False),
("Metal.framework", True),
("OpenGLES.framework", True),
Modified: trunk/Tools/Scripts/webkitdirs.pm (263309 => 263310)
--- trunk/Tools/Scripts/webkitdirs.pm 2020-06-20 02:26:14 UTC (rev 263309)
+++ trunk/Tools/Scripts/webkitdirs.pm 2020-06-20 02:37:03 UTC (rev 263310)
@@ -549,8 +549,7 @@
my $line = $_;
my $flag = 0;
foreach (@extract) {
- if (length($line) >= length($_) && substr($line, 0, length($_)) eq $_
- && index($line, 'i386') == -1 && index($line, 'x86_64') == -1) {
+ if (length($line) >= length($_) && substr($line, 0, length($_)) eq $_ && index($line, 'x86_64') == -1) {
$flag = 1;
}
}
