Attachment 361369 Details for Bug 193975 – Patch

[patch] Patch

bug-193975-20190206191902.patch (text/plain), 3.01 KB, created by Keith Rollin on 2019-02-06 19:19:03 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-02-06 19:19:03 PST

Size: 3.01 KB

patch

obsolete

>Subversion Revision: 241039
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index bacdf01af6c6ccaa713eb49f1c76cbee2710029c..376388467fdb39055d5b433ccc118609ee57e306 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-02-06  Keith Rollin  <krollin@apple.com>
>+
>+        Remove Info.plist from MobileMiniBrowser.framework's Copy Bundle Resources phase
>+        https://bugs.webkit.org/show_bug.cgi?id=193975
>+        <rdar://problem/47643306>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The MobileMiniBrowser.framework's Copy Bundle Resources phase copies
>+        the Info.plist file into the bundle. This step is not necessary as the
>+        implicit "bundle up all the build products into a framework" build
>+        phase does this already. Having the Copy Bundle Resources phase do
>+        this causes a conflict under XCBuild, which objects to two build
>+        phases producing the same file (Info.plist). Address this by removing
>+        Info.plist from the Copy Bundle Resources phase.
>+
>+        * MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
>+
> 2019-02-06  David Kilzer  <ddkilzer@apple.com>
> 
>         WTR::InjectedBundlePage::willSendRequestForFrame() leaks a WKDataRef
>diff --git a/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj b/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj
>index c439e1d62d3f1d4bbfa6a61f739f5eec78c0c4a7..a4c0a09c22e19560a61bd0afa0b60d3b3e3dfbba 100644
>--- a/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj
>+++ b/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj
>@@ -24,7 +24,6 @@
> 		CD498B501D763D7600681FA7 /* AppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD1DAF981D709E3600017CF0 /* AppDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		CD498B511D763D7F00681FA7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAF9E1D709E3600017CF0 /* Main.storyboard */; };
> 		CD498B521D763D8800681FA7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAFA11D709E3600017CF0 /* Assets.xcassets */; };
>-		CD498B531D763D9300681FA7 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = CD498B471D7634C700681FA7 /* Info.plist */; };
> 		CDA985191D76483400EBC399 /* test.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = CDA985151D76477900EBC399 /* test.mp4 */; };
> 		CDA9851A1D76483400EBC399 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985131D76474100EBC399 /* index.html */; };
> 		CDA9851B1D76483400EBC399 /* looping.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985171D7647CD00EBC399 /* looping.html */; };
>@@ -345,7 +344,6 @@
> 			files = (
> 				CD498B521D763D8800681FA7 /* Assets.xcassets in Resources */,
> 				CDA9851A1D76483400EBC399 /* index.html in Resources */,
>-				CD498B531D763D9300681FA7 /* Info.plist in Resources */,
> 				CDA9851B1D76483400EBC399 /* looping.html in Resources */,
> 				3F0B439B1D908D0C00D186B5 /* looping2s.html in Resources */,
> 				CD498B511D763D7F00681FA7 /* Main.storyboard in Resources */,

Actions: View | Formatted Diff | Diff

Attachments on bug 193975: 361369