Attachment 371515 Details for Bug 198616 – proposed fix

[patch] proposed fix

strip.txt (text/plain), 7.58 KB, created by Alexey Proskuryakov on 2019-06-06 11:41:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Proskuryakov

Created: 2019-06-06 11:41:48 PDT

Size: 7.58 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246158)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2019-06-06  Alexey Proskuryakov  <ap@apple.com>
>+
>+        Tool binaries like WebKitTestRunner have too aggressive stripping, resulting in non-symbolicated crash logs
>+        https://bugs.webkit.org/show_bug.cgi?id=198616
>+        rdar://problem/36386573
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adding an explicit STRIP_STYLE to appropriate xcconfigs.
>+
>+        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
>+        * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
>+        * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
>+        * ImageDiff/cg/Configurations/ImageDiff.xcconfig:
>+        * MiniBrowser/Configurations/MiniBrowser.xcconfig:
>+        * MobileMiniBrowser/Configurations/MobileMiniBrowser.xcconfig:
>+        * TestWebKitAPI/Configurations/TestWTF.xcconfig:
>+        * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
>+        * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
>+        * WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig:
>+
> 2019-06-06  Alexey Proskuryakov  <ap@apple.com>
> 
>         block-spammers tool doesn't block e-mail
>Index: Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig	(revision 246045)
>+++ Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig	(working copy)
>@@ -27,6 +27,7 @@ OTHER_LDFLAGS = $(inherited) $(PLATFORM_
> PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -framework JavaScriptCore;
> PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework JavaScriptCore -framework OpenGL -framework QuartzCore -framework WebKit;
> LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
>+STRIP_STYLE=debugging
> PRODUCT_NAME = DumpRenderTree;
> SKIP_INSTALL[sdk=macosx*] = NO;
> SKIP_INSTALL[sdk=iphone*] = YES;
>Index: Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig	(revision 246045)
>+++ Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig	(working copy)
>@@ -31,6 +31,8 @@ OTHER_LDFLAGS = $(PLATFORM_OTHER_LDFLAGS
> PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
> PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -framework JavaScriptCore;
> 
>+STRIP_STYLE=debugging
>+
> LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
> 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = ios/*;
>Index: Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig	(revision 246045)
>+++ Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig	(working copy)
>@@ -26,3 +26,4 @@
> #include "BaseTarget.xcconfig"
> 
> OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
>+STRIP_STYLE=debugging
>Index: Tools/ImageDiff/cg/Configurations/ImageDiff.xcconfig
>===================================================================
>--- Tools/ImageDiff/cg/Configurations/ImageDiff.xcconfig	(revision 246045)
>+++ Tools/ImageDiff/cg/Configurations/ImageDiff.xcconfig	(working copy)
>@@ -28,3 +28,4 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
> PRODUCT_NAME = ImageDiff;
> OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework QuartzCore;
> OTHER_LDFLAGS[sdk=iphone*] = $(inherited) -framework CoreFoundation -framework CoreGraphics -framework MobileCoreServices -framework ImageIO;
>+STRIP_STYLE=debugging
>Index: Tools/MiniBrowser/Configurations/MiniBrowser.xcconfig
>===================================================================
>--- Tools/MiniBrowser/Configurations/MiniBrowser.xcconfig	(revision 246045)
>+++ Tools/MiniBrowser/Configurations/MiniBrowser.xcconfig	(working copy)
>@@ -28,3 +28,4 @@ GCC_PREFIX_HEADER = mac/MiniBrowser_Pref
> INFOPLIST_FILE = mac/Info.plist
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *
> OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Cocoa -framework WebKit
>+STRIP_STYLE=debugging
>Index: Tools/MobileMiniBrowser/Configurations/MobileMiniBrowser.xcconfig
>===================================================================
>--- Tools/MobileMiniBrowser/Configurations/MobileMiniBrowser.xcconfig	(revision 246045)
>+++ Tools/MobileMiniBrowser/Configurations/MobileMiniBrowser.xcconfig	(working copy)
>@@ -22,3 +22,5 @@
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
> PRODUCT_NAME = MiniBrowser
>+
>+STRIP_STYLE=debugging
>Index: Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig	(revision 246045)
>+++ Tools/TestWebKitAPI/Configurations/TestWTF.xcconfig	(working copy)
>@@ -36,3 +36,5 @@ OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -f
> 
> // FIXME: This should not be built on iOS. Instead we should create and use a TestWTF application.
> OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework CoreGraphics;
>+
>+STRIP_STYLE=debugging
>Index: Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig	(revision 246045)
>+++ Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig	(working copy)
>@@ -37,3 +37,5 @@ OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -f
> LD_RUNPATH_SEARCH_PATHS = "@loader_path";
> 
> CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/TestWebKitAPI-iOS.entitlements;
>+
>+STRIP_STYLE=debugging
>Index: Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig
>===================================================================
>--- Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig	(revision 246045)
>+++ Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig	(working copy)
>@@ -30,6 +30,7 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path"
> PRODUCT_NAME = WebKitTestRunner;
> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
> OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit;
>+STRIP_STYLE=debugging
> SKIP_INSTALL[sdk=iphone*] = YES;
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/*;
> INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/main.mm;
>Index: Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig
>===================================================================
>--- Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig	(revision 246045)
>+++ Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig	(working copy)
>@@ -32,6 +32,8 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
> 
> OTHER_LDFLAGS = $(inherited) -lWebKitTestRunner -lWebCoreTestSupport -framework JavaScriptCore -framework CoreGraphics -framework QuartzCore -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation -framework GraphicsServices;
> 
>+STRIP_STYLE=debugging
>+
> SKIP_INSTALL[sdk=macosx*] = YES;
> 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = ios/* AppDelegate.m;

Flags:

ddkilzer: review+
ddkilzer: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 198616: 371515