Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Side by Side Diff: tools-webrtc/ios/build_ios_libs.sh

Issue 2676233002: Drop the check for stray mobileprovision (no longer needed) (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright 2015 The WebRTC project authors. All Rights Reserved. 3 # Copyright 2015 The WebRTC project authors. All Rights Reserved.
4 # 4 #
5 # Use of this source code is governed by a BSD-style license 5 # Use of this source code is governed by a BSD-style license
6 # that can be found in the LICENSE file in the root of the source 6 # that can be found in the LICENSE file in the root of the source
7 # tree. An additional intellectual property rights grant can be found 7 # tree. An additional intellectual property rights grant can be found
8 # in the file PATENTS. All contributing project authors may 8 # in the file PATENTS. All contributing project authors may
9 # be found in the AUTHORS file in the root of the source tree. 9 # be found in the AUTHORS file in the root of the source tree.
10 10
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 # Combine the slices. 174 # Combine the slices.
175 DYLIB_PATH="WebRTC.framework/WebRTC" 175 DYLIB_PATH="WebRTC.framework/WebRTC"
176 cp -R ${ARM64_LIB_PATH}/WebRTC.framework ${SDK_OUTPUT_DIR} 176 cp -R ${ARM64_LIB_PATH}/WebRTC.framework ${SDK_OUTPUT_DIR}
177 rm ${SDK_OUTPUT_DIR}/${DYLIB_PATH} 177 rm ${SDK_OUTPUT_DIR}/${DYLIB_PATH}
178 echo "Merging framework slices." 178 echo "Merging framework slices."
179 lipo ${ARM_LIB_PATH}/${DYLIB_PATH} \ 179 lipo ${ARM_LIB_PATH}/${DYLIB_PATH} \
180 ${ARM64_LIB_PATH}/${DYLIB_PATH} \ 180 ${ARM64_LIB_PATH}/${DYLIB_PATH} \
181 ${X64_LIB_PATH}/${DYLIB_PATH} \ 181 ${X64_LIB_PATH}/${DYLIB_PATH} \
182 -create -output ${SDK_OUTPUT_DIR}/${DYLIB_PATH} 182 -create -output ${SDK_OUTPUT_DIR}/${DYLIB_PATH}
183 183
184 # Remove stray mobileprovision if it exists until chromium roll lands.
185 # See https://codereview.chromium.org/2397433002.
186 PROVISION_FILE=${SDK_OUTPUT_DIR}/WebRTC.framework/embedded.mobileprovision
187 if [[ -e ${PROVISION_FILE} ]]; then
188 rm ${PROVISION_FILE}
189 fi
190
191 # Merge the dSYM slices. 184 # Merge the dSYM slices.
192 DSYM_PATH="WebRTC.dSYM/Contents/Resources/DWARF/WebRTC" 185 DSYM_PATH="WebRTC.dSYM/Contents/Resources/DWARF/WebRTC"
193 cp -R ${ARM64_LIB_PATH}/WebRTC.dSYM ${SDK_OUTPUT_DIR} 186 cp -R ${ARM64_LIB_PATH}/WebRTC.dSYM ${SDK_OUTPUT_DIR}
194 rm ${SDK_OUTPUT_DIR}/${DSYM_PATH} 187 rm ${SDK_OUTPUT_DIR}/${DSYM_PATH}
195 echo "Merging dSYM slices." 188 echo "Merging dSYM slices."
196 lipo ${ARM_LIB_PATH}/${DSYM_PATH} \ 189 lipo ${ARM_LIB_PATH}/${DSYM_PATH} \
197 ${ARM64_LIB_PATH}/${DSYM_PATH} \ 190 ${ARM64_LIB_PATH}/${DSYM_PATH} \
198 ${X64_LIB_PATH}/${DSYM_PATH} \ 191 ${X64_LIB_PATH}/${DSYM_PATH} \
199 -create -output ${SDK_OUTPUT_DIR}/${DSYM_PATH} 192 -create -output ${SDK_OUTPUT_DIR}/${DSYM_PATH}
200 193
201 # Modify the version number. 194 # Modify the version number.
202 # Format should be <Branch cut MXX>.<Hotfix #>.<Rev #>. 195 # Format should be <Branch cut MXX>.<Hotfix #>.<Rev #>.
203 # e.g. 55.0.14986 means branch cut 55, no hotfixes, and revision number 14986. 196 # e.g. 55.0.14986 means branch cut 55, no hotfixes, and revision number 14986.
204 INFOPLIST_PATH=${SDK_OUTPUT_DIR}/WebRTC.framework/Info.plist 197 INFOPLIST_PATH=${SDK_OUTPUT_DIR}/WebRTC.framework/Info.plist
205 MAJOR_MINOR=$(PlistBuddy -c "Print :CFBundleShortVersionString" \ 198 MAJOR_MINOR=$(PlistBuddy -c "Print :CFBundleShortVersionString" \
206 ${INFOPLIST_PATH}) 199 ${INFOPLIST_PATH})
207 VERSION_NUMBER="${MAJOR_MINOR}.${WEBRTC_REVISION}" 200 VERSION_NUMBER="${MAJOR_MINOR}.${WEBRTC_REVISION}"
208 echo "Substituting revision number: ${VERSION_NUMBER}" 201 echo "Substituting revision number: ${VERSION_NUMBER}"
209 PlistBuddy -c "Set :CFBundleVersion ${VERSION_NUMBER}" ${INFOPLIST_PATH} 202 PlistBuddy -c "Set :CFBundleVersion ${VERSION_NUMBER}" ${INFOPLIST_PATH}
210 plutil -convert binary1 ${INFOPLIST_PATH} 203 plutil -convert binary1 ${INFOPLIST_PATH}
211 else 204 else
212 echo "BUILD_TYPE ${BUILD_TYPE} not supported." 205 echo "BUILD_TYPE ${BUILD_TYPE} not supported."
213 exit 1 206 exit 1
214 fi 207 fi
215 208
216 echo "Done." 209 echo "Done."
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698