Index: talk/build/build_ios_libs.sh |
diff --git a/talk/build/build_ios_libs.sh b/talk/build/build_ios_libs.sh |
index 0ee112cc41a49c768fe27d7e97aaa4189e6f3681..8b6cb96d3c42dd4e086802ca48e936c2848a13d4 100755 |
--- a/talk/build/build_ios_libs.sh |
+++ b/talk/build/build_ios_libs.sh |
@@ -45,6 +45,12 @@ if [[ ! -x ${GYP_WEBRTC_SCRIPT} ]]; then |
echo "Failed to find gyp generator." >&2 |
exit 1 |
fi |
+# Check for export headers script. |
+EXPORT_HEADERS_SCRIPT=${SCRIPT_DIR}/export_headers |
+if [[ ! -x ${EXPORT_HEADERS_SCRIPT} ]]; then |
+ echo "Failed to find export headers script." >&2 |
+ exit 1 |
+fi |
# Check for merge script. |
MERGE_SCRIPT=${SCRIPT_DIR}/merge_ios_libs |
if [[ ! -x ${MERGE_SCRIPT} ]]; then |
@@ -59,7 +65,6 @@ function build_webrtc { |
OUTPUT_DIR=$1 |
FLAVOR=$2 |
TARGET_ARCH=$3 |
- TARGET_SUBARCH=$4 |
if [[ ${TARGET_ARCH} = 'arm' || ${TARGET_ARCH} = 'arm64' ]]; then |
FLAVOR="${FLAVOR}-iphoneos" |
else |
@@ -69,11 +74,19 @@ function build_webrtc { |
export GYP_GENERATORS="ninja" |
export GYP_GENERATOR_FLAGS="output_dir=${OUTPUT_DIR}" |
webrtc/build/gyp_webrtc talk/build/merge_ios_libs.gyp |
- ninja -C ${OUTPUT_DIR}/${FLAVOR} libjingle_peerconnection_objc_no_op |
+ ninja -C ${OUTPUT_DIR}/${FLAVOR} webrtc_api_objc_no_op |
mkdir -p ${LIBRARY_BASE_DIR}/${TARGET_ARCH} |
mv ${OUTPUT_DIR}/${FLAVOR}/*.a ${LIBRARY_BASE_DIR}/${TARGET_ARCH} |
} |
+function copy_headers { |
+ LIST_OF_HEADERS=$1 |
+ INCLUDE_BASE_DIR=$2 |
+ while read -r HEADER_PATH || [[ -n "$HEADER_PATH" ]]; do |
+ ditto ${HEADER_PATH} ${INCLUDE_BASE_DIR}/${HEADER_PATH} |
+ done < ${LIST_OF_HEADERS} |
+} |
+ |
# Build all the common architectures. |
build_webrtc "out_ios_arm" "Release" "arm" |
build_webrtc "out_ios_arm64" "Release" "arm64" |
@@ -82,5 +95,8 @@ build_webrtc "out_ios_x86_64" "Release" "x64" |
popd |
+# Export header files. |
+${EXPORT_HEADERS_SCRIPT} ${WEBRTC_BASE_DIR}/${LIBRARY_BASE_DIR} |
+ |
# Merge the libraries together. |
${MERGE_SCRIPT} ${WEBRTC_BASE_DIR}/${LIBRARY_BASE_DIR} |