zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable complete_static_lib on Mac and iOS

Browse Source 
BUG=webrtc:6418
NOTRY=True

Review-Url: https://codereview.webrtc.org/2764523002
Cr-Commit-Position: refs/heads/master@{#17354}
This commit is contained in:
kjellander
2017-03-23 02:49:15 -07:00
committed by Commit bot
parent 74e8126ac9
commit 7007bcf5b3
2 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/BUILD.gn
View File

@ -231,17 +231,7 @@ if (!build_with_chromium) {
"call.h",
"config.h",
]
# complete_static_lib doesn't work on Mac since libtool cannot support
# multiple objects with the same filenames (https://bugs.webrtc.org/6418).
if (is_win || is_linux || is_android) {
complete_static_lib = true
} else {
# TODO(kjellander): Remove this whenever possible. GN's static_library
# target type requires at least one object to avoid errors linking.
sources += [ "no_op_function.cc" ]
}
defines = []
deps = [

23
webrtc/no_op_function.cc
View File

@ -1,23 +0,0 @@
/*
* Copyright (c) 2016 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.
*/
namespace webrtc {
// TODO(kjellander): Remove this whenever possible. GN's static_library
// target type requires at least one object to avoid errors linking.
// No-op function that can be used to compile an object necessary
// for linking into a static library.
int foobarbaz() {
return 0;
}
} // namespace webrtc