Changeset 207504 in webkit

Timestamp:

Oct 18, 2016 4:55:04 PM (8 years ago)

Author:

bshafiei@apple.com

Message:

Merged r207474. rdar://problem/28786160

Location:

tags/Safari-603.1.9.0.2/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebCoreTestSupport.xcconfig (modified) (1 diff)

tags/Safari-603.1.9.0.2/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-18  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r207474.
+
+    2016-10-18  Dean Jackson  <dino@apple.com>
+
+            Remove dependency cycle with UIKit
+            https://bugs.webkit.org/show_bug.cgi?id=163577
+            <rdar://problem/28786160>
+
+            Reviewed by Tim Horton.
+
+            Soft link against UIKit. Followup patch because
+            I screwed up and forgot to edit the simulator
+            configuration.
+
+            * Configurations/WebCoreTestSupport.xcconfig:
+
 2016-10-17  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-603.1.9.0.2/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig

@@ -52 +52 @@
 OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit;
 OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
-OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -framework UIKit -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
+OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
 SECT_ORDER_FLAGS = ;