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

Commit e686d32

Browse files
authored
[ios] Add simulator dSYM slices to build output. (#5740)
Our release builds for device (with lipoed simulator binary) create a dSYM files for both the device and simulator. However the script only copied the device dSYM file to the output location. This adds a step to lipo together both the device and simulator dSYM files. Mapbox.framework.dSYM now holds armv7 and arm64 slices.
1 parent 03ebae0 commit e686d32

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

platform/ios/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CON
1010
* The `icon-text-fit` and `icon-text-fit-padding` properties are now supported in stylesheets, allowing the background of a shield to automatically resize to fit the shield’s text. ([#5334](https://github.com/mapbox/mapbox-gl-native/pull/5334))
1111
* Improved the performance of relocating a non-view-backed point annotation by changing its `coordinate` property. ([#5385](https://github.com/mapbox/mapbox-gl-native/pull/5385))
1212
* MGLMapDebugOverdrawVisualizationMask does nothing in Release builds of the SDK. This is disabled for performance reasons. ([#5555](https://github.com/mapbox/mapbox-gl-native/pull/5555))
13+
* Include simulator architecture slices in the dSYM file that is generated for release builds. ([#5740](https://github.com/mapbox/mapbox-gl-native/pull/5740))
1314

1415
## 3.3.1
1516

platform/ios/scripts/package.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,19 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
129129
cp -r \
130130
${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework \
131131
${OUTPUT}/dynamic/
132+
132133
if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM ]]; then
134+
step "Copying dSYM"
133135
cp -r ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM \
134-
${OUTPUT}/dynamic/
136+
${OUTPUT}/dynamic/
137+
if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM ]]; then
138+
step "Merging device and simulator dSYMs…"
139+
lipo \
140+
${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \
141+
${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \
142+
-create -output ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}
143+
lipo -info ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}
144+
fi
135145
fi
136146

137147
step "Merging simulator dynamic library into device dynamic library…"
@@ -160,6 +170,7 @@ else
160170
${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework \
161171
${OUTPUT}/dynamic/${NAME}.framework
162172
if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM ]]; then
173+
step "Copying dSYM"
163174
cp -r ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM \
164175
${OUTPUT}/dynamic/
165176
fi

0 commit comments

Comments
 (0)