| Index: webrtc/build/ios/build_ios_libs.sh
|
| diff --git a/talk/build/build_ios_libs.sh b/webrtc/build/ios/build_ios_libs.sh
|
| similarity index 57%
|
| rename from talk/build/build_ios_libs.sh
|
| rename to webrtc/build/ios/build_ios_libs.sh
|
| index 58300850663608086ffadf135005162ca89db065..1d920a49baa6495cf38d8486cab9edf473f150d8 100755
|
| --- a/talk/build/build_ios_libs.sh
|
| +++ b/webrtc/build/ios/build_ios_libs.sh
|
| @@ -1,34 +1,17 @@
|
| #!/bin/bash
|
| +
|
| +# Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
| #
|
| -# libjingle
|
| -# Copyright 2015 Google Inc.
|
| -#
|
| -# Redistribution and use in source and binary forms, with or without
|
| -# modification, are permitted provided that the following conditions are met:
|
| -#
|
| -# 1. Redistributions of source code must retain the above copyright notice,
|
| -# this list of conditions and the following disclaimer.
|
| -# 2. Redistributions in binary form must reproduce the above copyright notice,
|
| -# this list of conditions and the following disclaimer in the documentation
|
| -# and/or other materials provided with the distribution.
|
| -# 3. The name of the author may not be used to endorse or promote products
|
| -# derived from this software without specific prior written permission.
|
| -#
|
| -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
| -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
| -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
| -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
| -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| +# Use of this source code is governed by a BSD-style license
|
| +# that can be found in the LICENSE file in the root of the source
|
| +# tree. An additional intellectual property rights grant can be found
|
| +# in the file PATENTS. All contributing project authors may
|
| +# be found in the AUTHORS file in the root of the source tree.
|
|
|
| # Generates static FAT libraries for ios in out_ios_libs.
|
|
|
| # Flag to build the new or legacy version of the API.
|
| -USE_LEGACY_API=1
|
| +USE_LEGACY_API=0
|
|
|
| # Check for Darwin.
|
| if [[ ! $(uname) = "Darwin" ]]; then
|
| @@ -42,7 +25,7 @@ fi
|
|
|
| # Check for GYP generator.
|
| SCRIPT_DIR=$(dirname $0)
|
| -WEBRTC_BASE_DIR=${SCRIPT_DIR}/../..
|
| +WEBRTC_BASE_DIR=${SCRIPT_DIR}/../../..
|
| GYP_WEBRTC_SCRIPT=${WEBRTC_BASE_DIR}/webrtc/build/gyp_webrtc
|
| if [[ ! -x ${GYP_WEBRTC_SCRIPT} ]]; then
|
| echo "Failed to find gyp generator." >&2
|
| @@ -77,7 +60,7 @@ function build_webrtc {
|
| clang_xcode=1"
|
| export GYP_GENERATORS="ninja"
|
| export GYP_GENERATOR_FLAGS="output_dir=${OUTPUT_DIR}"
|
| - webrtc/build/gyp_webrtc talk/build/merge_ios_libs.gyp
|
| + webrtc/build/gyp_webrtc webrtc/build/ios/merge_ios_libs.gyp
|
| if [[ ${USE_LEGACY_API} -eq 1 ]]; then
|
| ninja -C ${OUTPUT_DIR}/${FLAVOR} libjingle_peerconnection_objc_no_op
|
| else
|
|
|