From 7007bcf5b3372c76c4cf5630a54acf089a32eeaa Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Thu, 23 Mar 2017 02:49:15 -0700
Subject: [PATCH] Enable complete_static_lib on Mac and iOS

BUG=webrtc:6418
NOTRY=True

Review-Url: https://codereview.webrtc.org/2764523002
Cr-Commit-Position: refs/heads/master@{#17354}
---
 webrtc/BUILD.gn          | 12 +-----------
 webrtc/no_op_function.cc | 23 -----------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 webrtc/no_op_function.cc

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 1a0a503543..5ac31323b0 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -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" ]
-    }
-
+    complete_static_lib = true
     defines = []
 
     deps = [
diff --git a/webrtc/no_op_function.cc b/webrtc/no_op_function.cc
deleted file mode 100644
index 4c10e37d39..0000000000
--- a/webrtc/no_op_function.cc
+++ /dev/null
@@ -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
-