Remove rtc_base:rtc_base_generic.
After https://webrtc-review.googlesource.com/c/105301 there is no need
to keep rtc_base splitted into rtc_base_generic and rtc_base_objc.
This CL remove removes rtc_base:rtc_base_generic and moves its content
into rtc_base:rtc_base.
Bug: webrtc:9838
Change-Id: Id263eea2e80a03f98457ad9f6c128cfef7630944
Reviewed-on: https://webrtc-review.googlesource.com/c/105640
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25146}diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 2580d46..faec269 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -688,18 +688,6 @@
rtc_static_library("rtc_base") {
visibility = [ "*" ]
- public_deps = []
- if (!build_with_mozilla) {
- public_deps += [ ":rtc_base_generic" ]
- }
- if (is_win || is_mac || is_ios) {
- sources = [
- "noop.cc",
- ]
- }
-}
-
-rtc_static_library("rtc_base_generic") {
cflags = []
cflags_cc = []
libs = []
@@ -827,11 +815,6 @@
"thread.h",
]
- visibility = [
- ":rtc_base",
- ":rtc_base_objc",
- ]
-
if (build_with_chromium) {
include_dirs = [ "../../boringssl/src/include" ]
public_configs += [ ":rtc_base_chromium_config" ]
diff --git a/rtc_base/noop.cc b/rtc_base/noop.cc
deleted file mode 100644
index 16a8e6d..0000000
--- a/rtc_base/noop.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 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.
- */
-
-// This file is only needed to make ninja happy on some platforms.
-// On some platforms it is not possible to link an rtc_static_library
-// without any source file listed in the GN target.
diff --git a/rtc_base/noop.mm b/rtc_base/noop.mm
deleted file mode 100644
index 16a8e6d..0000000
--- a/rtc_base/noop.mm
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 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.
- */
-
-// This file is only needed to make ninja happy on some platforms.
-// On some platforms it is not possible to link an rtc_static_library
-// without any source file listed in the GN target.
