From c6169ab50ccb51903b0100c2308d0d31bb073283 Mon Sep 17 00:00:00 2001
From: Jason Wray <jason@mapbox.com>
Date: Thu, 21 Dec 2017 11:39:03 -0800
Subject: [ios] Re-add i386 slice to framework; strip from dSYM

---
 platform/ios/CHANGELOG.md       | 2 +-
 platform/ios/INSTALL.md         | 2 +-
 platform/ios/scripts/package.sh | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index d5bf98d3f2..329f7db497 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -4,7 +4,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
 
 ## 3.7.2
 
-* Removed support for 32-bit simulators. ([#10772](https://github.com/mapbox/mapbox-gl-native/pull/10772))
+* Reduced the file size of the dSYM by removing the i386 architecture. Support for the i386 architecture (used by 32-bit simulators) will also be removed from the framework itself in a future release. ([#10781](https://github.com/mapbox/mapbox-gl-native/pull/10781))
 
 ## 3.7.1 - December 6, 2017
 
diff --git a/platform/ios/INSTALL.md b/platform/ios/INSTALL.md
index 9fca318729..b0d7be83d5 100644
--- a/platform/ios/INSTALL.md
+++ b/platform/ios/INSTALL.md
@@ -10,7 +10,7 @@ The Mapbox Maps SDK for iOS is intended to run on iOS 8.0 and above on the follo
 * iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2, Pro)
 * iPod touch 5th generation and above
 
-Note that 32-bit simulators (such as the iPhone 5 or iPad 2) are not supported.
+Note that debugging in 32-bit simulators (such as the iPhone 5 or iPad 2) is only partially supported. Support for these simulators will be removed entirely in a future release of this SDK.
 
 The Mapbox Maps SDK for iOS requires Xcode 8.0 or higher. To use this SDK with Xcode 7.3.1, download and use a symbols build from the [releases](https://github.com/mapbox/mapbox-gl-native/releases) page.
 
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index 6df1b687b4..31285182a7 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -70,7 +70,7 @@ xcodebuild \
     CURRENT_SHORT_VERSION=${SHORT_VERSION} \
     CURRENT_SEMANTIC_VERSION=${SEM_VERSION} \
     CURRENT_COMMIT_HASH=${HASH} \
-    ARCHS="x86_64" \
+    ONLY_ACTIVE_ARCH=NO \
     -derivedDataPath ${DERIVED_DATA} \
     -workspace ./platform/ios/ios.xcworkspace \
     -scheme ${SCHEME} \
@@ -194,6 +194,11 @@ if [[ ${BUILD_DYNAMIC} == true && ${BUILDTYPE} == Release ]]; then
     validate_dsym \
         "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" \
         "${OUTPUT}/dynamic/${NAME}.framework/${NAME}"
+
+        # To-do: remove this in 4.0.0, as we intend to remove support for i386 entirely.
+        step "Removing i386 slice from dSYM"
+        lipo -remove i386 "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" -o "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}"
+        lipo -info "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}"
 fi
 
 function create_podspec {
-- 
cgit v1.2.1