summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Bounds <jesse@rebounds.net>2016-07-21 11:51:42 -0700
committerJason Wray <jason@mapbox.com>2016-10-27 18:30:51 -0700
commit95ae8332447a545e753882bde2889fb9fd599b7c (patch)
tree36927958799f3bc485c4ec80e823b0976b940881
parent0a1d9849fa82f0ebd86b4960d363997bc7d3b896 (diff)
downloadqtlocation-mapboxgl-95ae8332447a545e753882bde2889fb9fd599b7c.tar.gz
[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.
-rwxr-xr-xplatform/ios/scripts/package.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index 00aae9b882..405868a064 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -127,9 +127,19 @@ if [[ ${BUILD_FOR_DEVICE} == true ]]; then
cp -r \
${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework \
${OUTPUT}/dynamic/
+
if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM ]]; then
+ step "Copying dSYM"
cp -r ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM \
- ${OUTPUT}/dynamic/
+ ${OUTPUT}/dynamic/
+ if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM ]]; then
+ step "Merging device and simulator dSYMs…"
+ lipo \
+ ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \
+ ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME} \
+ -create -output ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}
+ lipo -info ${OUTPUT}/dynamic/${NAME}.framework.dSYM/Contents/Resources/DWARF/${NAME}
+ fi
fi
step "Merging simulator dynamic library into device dynamic library…"
@@ -158,6 +168,7 @@ else
${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework \
${OUTPUT}/dynamic/${NAME}.framework
if [[ -e ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM ]]; then
+ step "Copying dSYM"
cp -r ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.framework.dSYM \
${OUTPUT}/dynamic/
fi