diff --git a/talk/app/webrtc/legacy_objc_api_tests.gyp b/talk/app/webrtc/legacy_objc_api_tests.gyp index 1d8b682c39..441abc9f2d 100755 --- a/talk/app/webrtc/legacy_objc_api_tests.gyp +++ b/talk/app/webrtc/legacy_objc_api_tests.gyp @@ -35,7 +35,7 @@ { 'target_name': 'libjingle_peerconnection_objc_test', 'type': 'executable', - 'includes': [ '../../build/objc_app.gypi' ], + 'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ], 'dependencies': [ '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', @@ -67,7 +67,7 @@ { 'target_name': 'apprtc_signaling_gunit_test', 'type': 'executable', - 'includes': [ '../../build/objc_app.gypi' ], + 'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ], 'dependencies': [ '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', diff --git a/talk/build/OWNERS b/talk/build/OWNERS deleted file mode 100644 index 3ee6b4bf5f..0000000000 --- a/talk/build/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ - -# These are for the common case of adding or renaming files. If you're doing -# structural changes, please get a review from a reviewer in this file. -per-file *.gyp=* -per-file *.gypi=* diff --git a/talk/build/merge_ios_libs.gyp b/talk/build/merge_ios_libs.gyp deleted file mode 100644 index 83625ff7db..0000000000 --- a/talk/build/merge_ios_libs.gyp +++ /dev/null @@ -1,53 +0,0 @@ -# -# 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. - -{ - 'includes': ['common.gypi',], - 'conditions': [ - ['OS=="ios" or OS=="mac"', { - 'targets': [ - { - 'target_name': 'libjingle_peerconnection_objc_no_op', - 'includes': [ 'objc_app.gypi' ], - 'type': 'executable', - 'dependencies': [ - '../app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_objc', - ], - 'sources': ['<(webrtc_root)/build/no_op.cc',], - }, - { - 'target_name': 'webrtc_api_objc_no_op', - 'includes': [ 'objc_app.gypi' ], - 'type': 'executable', - 'dependencies': [ - '<(webrtc_root)/api/api.gyp:rtc_api_objc', - ], - 'sources': ['<(webrtc_root)/build/no_op.cc',], - }, - ], - }] - ], -} diff --git a/talk/build/objc_app.gypi b/talk/build/objc_app.gypi deleted file mode 100644 index 4fbd5aeeaf..0000000000 --- a/talk/build/objc_app.gypi +++ /dev/null @@ -1,51 +0,0 @@ -# -# libjingle -# Copyright 2014 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. -# - -# Include this .gypi in an ObjC target's definition to allow it to be -# used as an iOS or OS/X application. - -{ - 'variables': { - 'infoplist_file': './objc_app.plist', - }, - 'dependencies': [ - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', - ], - 'mac_bundle': 1, - 'mac_bundle_resources': [ - '<(infoplist_file)', - ], - # The plist is listed above so that it appears in XCode's file list, - # but we don't actually want to bundle it. - 'mac_bundle_resources!': [ - '<(infoplist_file)', - ], - 'xcode_settings': { - 'CLANG_ENABLE_OBJC_ARC': 'YES', - 'INFOPLIST_FILE': '<(infoplist_file)', - }, -} diff --git a/talk/build/whitespace.txt b/talk/build/whitespace.txt deleted file mode 100644 index 6acacd58d5..0000000000 --- a/talk/build/whitespace.txt +++ /dev/null @@ -1,5 +0,0 @@ -You can modify this file to create no-op changelists. -Try to write something funny. And please don't add trailing whitespace. - -Once upon a time there were three whitespaces. - diff --git a/webrtc/build/ios/OWNERS b/webrtc/build/ios/OWNERS index 0428a4a1ae..f0b40d41b5 100644 --- a/webrtc/build/ios/OWNERS +++ b/webrtc/build/ios/OWNERS @@ -1 +1,2 @@ kjellander@webrtc.org +tkchin@webrtc.org 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 5830085066..1d920a49ba 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 diff --git a/talk/build/export_headers b/webrtc/build/ios/export_headers similarity index 97% rename from talk/build/export_headers rename to webrtc/build/ios/export_headers index 6d66f06619..4786104e92 100755 --- a/talk/build/export_headers +++ b/webrtc/build/ios/export_headers @@ -41,7 +41,7 @@ def ExportHeaders(include_base_dir, use_legacy_headers): include_path = os.path.join(include_base_dir, include_dir_name) script_path = sys.path[0] - webrtc_base_path = os.path.join(script_path, '../..') + webrtc_base_path = os.path.join(script_path, '../../..') header_dirs = HEADER_DIRS include_headers = HEADER_INCLUDES diff --git a/talk/build/merge_ios_libs b/webrtc/build/ios/merge_ios_libs similarity index 71% rename from talk/build/merge_ios_libs rename to webrtc/build/ios/merge_ios_libs index 6d2698bc42..d96d5e3c0c 100755 --- a/talk/build/merge_ios_libs +++ b/webrtc/build/ios/merge_ios_libs @@ -1,29 +1,12 @@ #!/usr/bin/python + +# Copyright 2016 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. """Script for merging generated iOS libraries.""" diff --git a/webrtc/build/ios/merge_ios_libs.gyp b/webrtc/build/ios/merge_ios_libs.gyp new file mode 100644 index 0000000000..cc24d6530e --- /dev/null +++ b/webrtc/build/ios/merge_ios_libs.gyp @@ -0,0 +1,35 @@ +# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. +# +# 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. + +{ + 'includes': ['../common.gypi',], + 'conditions': [ + ['OS=="ios" or OS=="mac"', { + 'targets': [ + { + 'target_name': 'libjingle_peerconnection_objc_no_op', + 'includes': [ 'objc_app.gypi' ], + 'type': 'executable', + 'dependencies': [ + '../../../talk/app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_objc', + ], + 'sources': ['no_op.cc',], + }, + { + 'target_name': 'webrtc_api_objc_no_op', + 'includes': [ 'objc_app.gypi' ], + 'type': 'executable', + 'dependencies': [ + '<(webrtc_root)/api/api.gyp:rtc_api_objc', + ], + 'sources': ['no_op.cc',], + }, + ], + }] + ], +} diff --git a/webrtc/build/ios/no_op.cc b/webrtc/build/ios/no_op.cc new file mode 100644 index 0000000000..7508b9dbb4 --- /dev/null +++ b/webrtc/build/ios/no_op.cc @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. + * + * 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. + */ + +// No-op main() to provide a dummy executable target. +int main() { + return 0; +} diff --git a/webrtc/build/ios/objc_app.gypi b/webrtc/build/ios/objc_app.gypi new file mode 100644 index 0000000000..bb69ca7b20 --- /dev/null +++ b/webrtc/build/ios/objc_app.gypi @@ -0,0 +1,32 @@ +# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. +# +# 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. + +# Include this .gypi in an ObjC target's definition to allow it to be +# used as an iOS or OS/X application. + +{ + 'variables': { + 'infoplist_file': './objc_app.plist', + }, + 'dependencies': [ + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', + ], + 'mac_bundle': 1, + 'mac_bundle_resources': [ + '<(infoplist_file)', + ], + # The plist is listed above so that it appears in XCode's file list, + # but we don't actually want to bundle it. + 'mac_bundle_resources!': [ + '<(infoplist_file)', + ], + 'xcode_settings': { + 'CLANG_ENABLE_OBJC_ARC': 'YES', + 'INFOPLIST_FILE': '<(infoplist_file)', + }, +} diff --git a/talk/build/objc_app.plist b/webrtc/build/ios/objc_app.plist similarity index 100% rename from talk/build/objc_app.plist rename to webrtc/build/ios/objc_app.plist