Title: [253447] tags/Safari-609.1.12/Source/ThirdParty/ANGLE
- Revision
- 253447
- Author
- [email protected]
- Date
- 2019-12-12 15:29:59 -0800 (Thu, 12 Dec 2019)
Log Message
Cherry-pick r253383. rdar://problem/57713353
Produce a dummy libANGLE.a file to fool Apple's build test infrastructure
https://bugs.webkit.org/show_bug.cgi?id=205068
<rdar://problem/57713353>
Unreviewed followup to apply the script to Mac Catalyst builds.
Note that this phase can be removed in a few days when Apple's Test
Platform realises it doesn't need libANGLE.a any more.
* ANGLE.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@253383 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-609.1.12/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (253446 => 253447)
--- tags/Safari-609.1.12/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2019-12-12 23:29:56 UTC (rev 253446)
+++ tags/Safari-609.1.12/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2019-12-12 23:29:59 UTC (rev 253447)
@@ -2976,7 +2976,7 @@
312BDB0B15FECAB00097EBC7 /* CopyFiles */,
312BDB0D15FECACE0097EBC7 /* CopyFiles */,
6E28B8742294DD8000717E69 /* ShellScript */,
- 313DE867239FFF91008FC47B /* ShellScript */,
+ 313DE867239FFF91008FC47B /* Attempt to fool Apple Test Platform */,
);
buildRules = (
53E934DB230609D800DE060C /* PBXBuildRule */,
@@ -3017,7 +3017,7 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- 313DE867239FFF91008FC47B /* ShellScript */ = {
+ 313DE867239FFF91008FC47B /* Attempt to fool Apple Test Platform */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -3026,6 +3026,7 @@
);
inputPaths = (
);
+ name = "Attempt to fool Apple Test Platform";
outputFileListPaths = (
);
outputPaths = (
@@ -3032,7 +3033,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"$DEPLOYMENT_LOCATION\" == \"YES\" ] ; then\n # Apple-internal build.\n output_dir=${DSTROOT}/usr/local/lib\nelse\n # External build.\n output_dir=${BUILT_PRODUCTS_DIR}/usr/local/lib\nfi\n\nmkdir -p $output_dir\necho \"Fake file to fool Apple's test system\" > $output_dir/libANGLE.a\n";
+ shellScript = "if [ \"$DEPLOYMENT_LOCATION\" == \"YES\" ] ; then\n # Apple-internal build.\n output_dir=${DSTROOT}${WK_ALTERNATE_FRAMEWORKS_DIR}/usr/local/lib\nelse\n # External build.\n output_dir=${BUILT_PRODUCTS_DIR}/usr/local/lib\nfi\n\nmkdir -p $output_dir\necho \"Fake file to fool Apple's test system\" > $output_dir/libANGLE.a\n";
};
6E28B8742294DD8000717E69 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Modified: tags/Safari-609.1.12/Source/ThirdParty/ANGLE/ChangeLog (253446 => 253447)
--- tags/Safari-609.1.12/Source/ThirdParty/ANGLE/ChangeLog 2019-12-12 23:29:56 UTC (rev 253446)
+++ tags/Safari-609.1.12/Source/ThirdParty/ANGLE/ChangeLog 2019-12-12 23:29:59 UTC (rev 253447)
@@ -1,5 +1,35 @@
2019-12-12 Alan Coon <[email protected]>
+ Cherry-pick r253383. rdar://problem/57713353
+
+ Produce a dummy libANGLE.a file to fool Apple's build test infrastructure
+ https://bugs.webkit.org/show_bug.cgi?id=205068
+ <rdar://problem/57713353>
+
+ Unreviewed followup to apply the script to Mac Catalyst builds.
+
+ Note that this phase can be removed in a few days when Apple's Test
+ Platform realises it doesn't need libANGLE.a any more.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@253383 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-12-11 Dean Jackson <[email protected]>
+
+ Produce a dummy libANGLE.a file to fool Apple's build test infrastructure
+ https://bugs.webkit.org/show_bug.cgi?id=205068
+ <rdar://problem/57713353>
+
+ Unreviewed followup to apply the script to Mac Catalyst builds.
+
+ Note that this phase can be removed in a few days when Apple's Test
+ Platform realises it doesn't need libANGLE.a any more.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+
+2019-12-12 Alan Coon <[email protected]>
+
Cherry-pick r253333. rdar://problem/57713353
Produce a dummy libANGLE.a file to fool Apple's build test infrastructure
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
