diff options
| author | Jason Wray <jason@mapbox.com> | 2017-12-20 16:55:30 -0800 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2017-12-20 17:36:06 -0800 |
| commit | 8e69a35d758d4fa632ed153590ae56c976269b76 (patch) | |
| tree | 8d18b3f210a53286f6b26a5097e793b1393dcb73 /platform/ios/scripts | |
| parent | 6a9eec8ed5dee4a4527c25523d4a8b1aee758212 (diff) | |
| download | qtlocation-mapboxgl-8e69a35d758d4fa632ed153590ae56c976269b76.tar.gz | |
[ios, build] Stop packaging i386 simulator arch
Only builds and packages x86_64 architecture in our frameworks and dSYM. Removes support for 32-bit simulators, such as the iPhone 5 and iPad 2. This does not affect device support — 32-bit devices are still supported via the arm7 architecture.
Diffstat (limited to 'platform/ios/scripts')
| -rwxr-xr-x | platform/ios/scripts/metrics.sh | 2 | ||||
| -rwxr-xr-x | platform/ios/scripts/package.sh | 2 | ||||
| -rwxr-xr-x | platform/ios/scripts/validate-framework-zip.sh | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/platform/ios/scripts/metrics.sh b/platform/ios/scripts/metrics.sh index c45beb3a11..2a241323c2 100755 --- a/platform/ios/scripts/metrics.sh +++ b/platform/ios/scripts/metrics.sh @@ -7,13 +7,11 @@ set -o pipefail xcrun bitcode_strip build/ios/pkg/dynamic/Mapbox.framework/Mapbox -r -o build/ios/pkg/dynamic/Mapbox-stripped lipo build/ios/pkg/dynamic/Mapbox-stripped -extract armv7 -output build/ios/pkg/dynamic/Mapbox-stripped-armv7 lipo build/ios/pkg/dynamic/Mapbox-stripped -extract arm64 -output build/ios/pkg/dynamic/Mapbox-stripped-arm64 -lipo build/ios/pkg/dynamic/Mapbox-stripped -extract i386 -output build/ios/pkg/dynamic/Mapbox-stripped-i386 lipo build/ios/pkg/dynamic/Mapbox-stripped -extract x86_64 -output build/ios/pkg/dynamic/Mapbox-stripped-x86_64 # Track individual architectures scripts/log_binary_size.sh "build/ios/pkg/dynamic/Mapbox-stripped-armv7" "Platform=iOS,Arch=armv7" scripts/log_binary_size.sh "build/ios/pkg/dynamic/Mapbox-stripped-arm64" "Platform=iOS,Arch=arm64" -scripts/log_binary_size.sh "build/ios/pkg/dynamic/Mapbox-stripped-i386" "Platform=iOS,Arch=i386" scripts/log_binary_size.sh "build/ios/pkg/dynamic/Mapbox-stripped-x86_64" "Platform=iOS,Arch=x86_64" # Track overall library size diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index 0acce9a57f..6df1b687b4 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} \ - ONLY_ACTIVE_ARCH=NO \ + ARCHS="x86_64" \ -derivedDataPath ${DERIVED_DATA} \ -workspace ./platform/ios/ios.xcworkspace \ -scheme ${SCHEME} \ diff --git a/platform/ios/scripts/validate-framework-zip.sh b/platform/ios/scripts/validate-framework-zip.sh index 2cd1e90ee7..0bcd094b69 100755 --- a/platform/ios/scripts/validate-framework-zip.sh +++ b/platform/ios/scripts/validate-framework-zip.sh @@ -54,7 +54,7 @@ function verifyFramework() { # Verify the static lib at least has simulator and the two common ARM architectures local PRESENT_ARCHITECTURES=$( xcrun lipo -info "${BINARY_PATH}" ) - for arch in "armv7" "arm64" "i386" "x86_64"; do + for arch in "armv7" "arm64" "x86_64"; do if [[ ! $PRESENT_ARCHITECTURES == *$arch* ]]; then printf "ERROR: Architecture ${arch} not found in ${FRAMEWORK_NAME}\n"; exit 6; |