Changeset 267670 in webkit

Timestamp:

Sep 27, 2020, 1:00:02 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r265977. rdar://problem/69594018

Could not find module 'WebKit' for target 'armv7-apple-ios'
<​https://bugs.webkit.org/show_bug.cgi?id=215190>
<rdar://problem/65642049>

Reviewed by Brady Eidson.

The config changes here got added to the wrong config file. They need to
be for the overlay, not its tests.

• SwiftOverlay/Configurations/WebKitSwiftOverlay.xcconfig:
• SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@265977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig (modified) (1 diff)

branches/safari-610-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r265977. rdar://problem/69594018
+
+    Could not find module 'WebKit' for target 'armv7-apple-ios'
+    <https://bugs.webkit.org/show_bug.cgi?id=215190>
+    <rdar://problem/65642049>
+    
+    Reviewed by Brady Eidson.
+    
+    The config changes here got added to the wrong config file. They need to
+    be for the overlay, not its tests.
+    
+    * SwiftOverlay/Configurations/WebKitSwiftOverlay.xcconfig:
+    * SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265977 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-08-20  James Savage  <james.savage@apple.com>
+
+            Could not find module 'WebKit' for target 'armv7-apple-ios'
+            <https://bugs.webkit.org/show_bug.cgi?id=215190>
+            <rdar://problem/65642049>
+
+            Reviewed by Brady Eidson.
+
+            The config changes here got added to the wrong config file. They need to
+            be for the overlay, not its tests.
+
+            * SwiftOverlay/Configurations/WebKitSwiftOverlay.xcconfig:
+            * SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig:
+
 2020-09-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/Source/WebKit/SwiftOverlay/Configurations/WebKitSwiftOverlayTests.xcconfig

@@ -45 +45 @@
 SDKROOT[sdk=appletv*] = appletvos.internal
 SDKROOT[sdk=watchos*] = watchos.internal
-
-// We need to generate swiftmodules for these architectures, so that they can be
-// imported in apps that are deployable on OS versions that support them.
-// However, we can only generate module files for these; we can't emit binaries.
-// (All imported definitions will be unavailable on these older OS versions.)
-SWIFT_MODULE_ONLY_ARCHS[sdk=iphoneos*] = armv7 armv7s
-SWIFT_MODULE_ONLY_ARCHS[sdk=iphonesimulator*] = i386
-SWIFT_MODULE_ONLY_IPHONEOS_DEPLOYMENT_TARGET = 10.3
-SWIFT_MODULE_ONLY_ARCHS[sdk=watchos*] =
-SWIFT_MODULE_ONLY_ARCHS[sdk=watchsimulator*] =
-SWIFT_MODULE_ONLY_ARCHS[sdk=appletvos*] =
-SWIFT_MODULE_ONLY_ARCHS[sdk=appletvsimulator*] =