Split rtc_task_queue target. Add separate target for sequenced_task_checker and weak_ptr.

webrtc/base/BUILD.gn

 # 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
 import("../webrtc.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 if (is_win) {
   import("//build/config/clang/clang.gni")
 }
 
 group("base") {
   public_deps = [
     ":rtc_base",
     ":rtc_base_approved",
     ":rtc_task_queue",
+    ":sequenced_task_checker",
+    ":weak_ptr",
   ]
   if (is_android) {
     public_deps += [ ":base_java" ]
   }
 }
 
 config("rtc_base_approved_all_dependent_config") {
   if (is_mac && !build_with_chromium) {
     libs = [ "Foundation.framework" ]  # needed for logging_mac.mm
   }
@@ skipping 252 matching lines @@
 
 config("enable_libevent_config") {
   defines = [ "WEBRTC_BUILD_LIBEVENT" ]
 }
 
 rtc_static_library("rtc_task_queue") {
   public_deps = [
     ":rtc_base_approved",
   ]
 
-  sources = [
-    "sequenced_task_checker.h",
-    "sequenced_task_checker_impl.cc",
-    "sequenced_task_checker_impl.h",
-    "weak_ptr.cc",
-    "weak_ptr.h",
-  ]
-
   if (build_with_chromium) {
-    sources += [
+    sources = [
       "../../webrtc_overrides/webrtc/base/task_queue.cc",
       "../../webrtc_overrides/webrtc/base/task_queue.h",
     ]
   } else {
-    sources += [
+    sources = [
       "task_queue.h",
       "task_queue_posix.h",
     ]
     if (rtc_build_libevent) {
       deps = [
         "//base/third_party/libevent",
       ]
     }
 
     if (rtc_enable_libevent) {
       sources += [
         "task_queue_libevent.cc",
         "task_queue_posix.cc",
       ]
       all_dependent_configs = [ ":enable_libevent_config" ]
     } else {
       if (is_mac || is_ios) {
         sources += [
           "task_queue_gcd.cc",
           "task_queue_posix.cc",
         ]
       }
       if (is_win) {
         sources += [ "task_queue_win.cc" ]
       }
     }
   }
 }
 
+rtc_static_library("sequenced_task_checker") {
+  public_deps = [
+    ":rtc_base_approved",

[kjellander_webrtc, 2017/06/12 10:56:38]

Please move to deps or explain why public_deps is needed?

[perkj_webrtc, 2017/06/12 11:04:03]

moved to weak_ptr which is actually where its needed. Thanks.

+  ]
+
+  sources = [
+    "sequenced_task_checker.h",
+    "sequenced_task_checker_impl.cc",
+    "sequenced_task_checker_impl.h",
+  ]
+  deps = [
+    ":rtc_task_queue",
+  ]
+}
+
+rtc_static_library("weak_ptr") {
+  sources = [
+    "weak_ptr.cc",
+    "weak_ptr.h",
+  ]
+  deps = [
+    ":sequenced_task_checker",
+  ]
+}
+
 rtc_static_library("rtc_numerics") {
   sources = [
     "numerics/exp_filter.cc",
     "numerics/exp_filter.h",
     "numerics/percentile_filter.h",
   ]
   deps = [
     ":rtc_base_approved",
   ]
 }
@@ skipping 502 matching lines @@
     }
     sources = [
       "sequenced_task_checker_unittest.cc",
       "task_queue_unittest.cc",
       "weak_ptr_unittest.cc",
     ]
     deps = [
       ":rtc_base_tests_main",
       ":rtc_base_tests_utils",
       ":rtc_task_queue",
+      ":sequenced_task_checker",
+      ":weak_ptr",
       "../test:test_support",
     ]
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 
   rtc_source_set("rtc_numerics_unittests") {
     testonly = true
@@ skipping 94 matching lines @@
 if (is_android) {
   android_library("base_java") {
     java_files = [
       "java/src/org/webrtc/ContextUtils.java",
       "java/src/org/webrtc/Logging.java",
       "java/src/org/webrtc/Size.java",
       "java/src/org/webrtc/ThreadUtils.java",
     ]
   }
 }