Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit c6169ab

Browse files
committed
[ios] Re-add i386 slice to framework; strip from dSYM
1 parent ff62fa9 commit c6169ab

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

platform/ios/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
44

55
## 3.7.2
66

7-
* Removed support for 32-bit simulators. ([#10772](https://github.com/mapbox/mapbox-gl-native/pull/10772))
7+
* 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))
88

99
## 3.7.1 - December 6, 2017
1010

platform/ios/INSTALL.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The Mapbox Maps SDK for iOS is intended to run on iOS 8.0 and above on the follo
1010
* iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2, Pro)
1111
* iPod touch 5th generation and above
1212

13-
Note that 32-bit simulators (such as the iPhone 5 or iPad 2) are not supported.
13+
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.
1414

1515
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.
1616

platform/ios/scripts/package.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ xcodebuild \
7070
CURRENT_SHORT_VERSION=${SHORT_VERSION} \
7171
CURRENT_SEMANTIC_VERSION=${SEM_VERSION} \
7272
CURRENT_COMMIT_HASH=${HASH} \
73-
ARCHS="x86_64" \
73+
ONLY_ACTIVE_ARCH=NO \
7474
-derivedDataPath ${DERIVED_DATA} \
7575
-workspace ./platform/ios/ios.xcworkspace \
7676
-scheme ${SCHEME} \
@@ -194,6 +194,11 @@ if [[ ${BUILD_DYNAMIC} == true && ${BUILDTYPE} == Release ]]; then
194194
validate_dsym \
195195
"${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" \
196196
"${OUTPUT}/dynamic/${NAME}.framework/${NAME}"
197+
198+
# To-do: remove this in 4.0.0, as we intend to remove support for i386 entirely.
199+
step "Removing i386 slice from dSYM"
200+
lipo -remove i386 "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}" -o "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}"
201+
lipo -info "${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}"
197202
fi
198203

199204
function create_podspec {

0 commit comments

Comments
 (0)