diff options
| author | Jesse Bounds <jesse@rebounds.net> | 2016-07-06 08:09:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 08:09:10 -0700 |
| commit | 687013bc991a63e5b520eda3ba505ebd8864fd2d (patch) | |
| tree | 3c9f688ce2b3f4d27613443d1249e586b7a1f7ce /platform/ios | |
| parent | 9993017cc9238b609ca861e84e6d8403922cd480 (diff) | |
| download | qtlocation-mapboxgl-687013bc991a63e5b520eda3ba505ebd8864fd2d.tar.gz | |
[ios] Add support for full Bitcode builds (#5586)
In https://github.com/mapbox/mapbox-gl-native/commit/
f791eb32b9ebe96845e87e5a6acd3ee46182c1d5 we simplified the package
script and intended to remove support for building the SDK without
Bitcode support. The intention was to use the ENABLE_BITCODE project
setting to do this and remove the control of that variable in the
script. However, since we use `xcodebuild build` this only uses
bitcode `marker` by default and causes a failure when an app that uses
the Mapbox SDK is archived.
This adds the `BITCODE_GENERATION_MODE` and `bitcode` value to the
necessary iOS SDK and mbgl and platform targets. If the SDK is compiled
with these flags set, it will be successfully processed in the bitcode
phase in an app archive operation.
This also removes the `BITCODE` flag from the Makefile since the
intention is to not support building the SDK without bitcode support
and the presence of that option might be confusing.
Diffstat (limited to 'platform/ios')
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | platform/ios/platform.gyp | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index bdc0fbd900..83ae3e6406 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -1729,6 +1729,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1769,6 +1770,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1831,6 +1833,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; HEADER_SEARCH_PATHS = ( ../default, ../../include, @@ -1861,6 +1864,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; HEADER_SEARCH_PATHS = ( ../default, ../../include, diff --git a/platform/ios/platform.gyp b/platform/ios/platform.gyp index e4abff27e3..4cb26091d4 100644 --- a/platform/ios/platform.gyp +++ b/platform/ios/platform.gyp @@ -129,6 +129,14 @@ 'CLANG_ENABLE_OBJC_ARC': 'YES', 'CLANG_ENABLE_MODULES': 'YES', }, + + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'BITCODE_GENERATION_MODE': 'bitcode', + }, + },], + ], 'link_settings': { 'libraries': [ '<@(libraries)' ], |