commit 15a3c3fdca8f86d1c5c2300cf13e6db75ae45a13
author Florent Castelli <orphis@webrtc.org> Wed Apr 27 08:33:27 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 05 06:47:49 2022
tree 9a9e68a9bc145754442064bfac8120c32bb31ed0
parent d852d9c5367565f1ad2365337b121798e5e2814a

Split Windows code from rtc_base_approved to smaller targets

Bug: webrtc:9838
Change-Id: Ic463284fd68715fd9b8eadd50e1d25841cb60020
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261241
Auto-Submit: Florent Castelli <orphis@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36768}

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 94d2298..1e1ca47 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -80,33 +80,6 @@
 # the old concept of rtc_base and rtc_base_approved.
 rtc_source_set("rtc_base_approved") {
   visibility = [ "*" ]
-
-  if (is_win) {
-    sources = [
-      "win/get_activation_factory.cc",
-      "win/get_activation_factory.h",
-      "win/hstring.cc",
-      "win/hstring.h",
-      "win/scoped_com_initializer.cc",
-      "win/scoped_com_initializer.h",
-      "win/windows_version.cc",
-      "win/windows_version.h",
-    ]
-    deps = [
-      ":checks",
-      ":logging",
-      ":stringutils",
-    ]
-    data_deps = [ "//build/win:runtime_libs" ]
-  }
-
-  # These files add a dependency on the Win10 SDK v10.0.10240.
-  if (rtc_enable_win_wgc) {
-    sources += [
-      "win/create_direct3d_device.cc",
-      "win/create_direct3d_device.h",
-    ]
-  }
 }
 
 rtc_source_set("buffer") {
@@ -851,8 +824,8 @@
   }
   if (is_win) {
     deps += [
-      ":rtc_base_approved",
       ":win32",
+      "win:windows_version",
     ]
   }
   absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
@@ -1581,9 +1554,6 @@
         "virtual_socket_unittest.cc",
         "zero_memory_unittest.cc",
       ]
-      if (is_win) {
-        sources += [ "win/windows_version_unittest.cc" ]
-      }
       deps = [
         ":atomicops",
         ":bit_buffer",
@@ -1658,6 +1628,10 @@
         "//third_party/abseil-cpp/absl/strings",
         "//third_party/abseil-cpp/absl/types:optional",
       ]
+
+      if (is_win) {
+        deps += [ "win:windows_version_unittest" ]
+      }
     }
 
     rtc_library("rtc_task_queue_unittests") {