From 30c8e0e722068b79706f4a5baa75e46db4ea08f1 Mon Sep 17 00:00:00 2001
From: Francis Tsui <ftsui@google.com>
Date: Mon, 9 Sep 2024 19:12:54 -0700
Subject: [PATCH] Simplify winrt build target.

PiperOrigin-RevId: 672754586
---
 internal/platform/implementation/windows/BUILD         | 10 ++--------
 .../platform/implementation/windows/device_info.cc     |  4 ++--
 .../platform/implementation/windows/generated/BUILD    |  4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/internal/platform/implementation/windows/BUILD b/internal/platform/implementation/windows/BUILD
index 5aa85bac..fe185439 100644
--- a/internal/platform/implementation/windows/BUILD
+++ b/internal/platform/implementation/windows/BUILD
@@ -40,11 +40,6 @@ cc_library(
         "timer.h",
         "utils.h",
     ],
-    copts = [
-        "-Ithird_party/nearby/internal/platform/implementation/windows/generated",
-        "-Wno-non-virtual-dtor",
-        "-Wno-vla-extension",
-    ],
     defines = ["_SILENCE_CLANG_COROUTINE_MESSAGE"],
     visibility = ["//sharing/internal/impl/windows:__pkg__"],
     deps = [
@@ -197,8 +192,7 @@ cc_library(
     # WFD API is only support after _WIN32_WINNT_WIN8, but the current lexan _WIN32_WINNT is set to _WIN32_WINNT_WIN7
     copts = [
         "-DNO_INTEL_PIE",
-        "-Ithird_party/nearby/internal/platform/implementation/windows/generated -D_WIN32_WINNT=_WIN32_WINNT_WIN10 -DWINVER=_WIN32_WINNT_WIN10",
-        "-Wno-non-virtual-dtor",
+        "-D_WIN32_WINNT=_WIN32_WINNT_WIN10 -DWINVER=_WIN32_WINNT_WIN10",
         "-Wno-unused-variable",
         "-Wno-unused-value",
     ],
@@ -294,7 +288,7 @@ cc_test(
         "wifi_hotspot_test.cc",
         "wifi_medium_test.cc",
     ],
-    copts = ["-Ithird_party/nearby/internal/platform/implementation/windows/generated -DCORE_ADAPTER_DLL"],
+    copts = ["-DCORE_ADAPTER_DLL"],
     tags = ["nozapfhahn"],
     deps = [
         ":comm",
diff --git a/internal/platform/implementation/windows/device_info.cc b/internal/platform/implementation/windows/device_info.cc
index 01aa4d6a..341b9b93 100644
--- a/internal/platform/implementation/windows/device_info.cc
+++ b/internal/platform/implementation/windows/device_info.cc
@@ -65,8 +65,8 @@ std::optional<std::string> DeviceInfo::GetOsDeviceName() const {
     }
   }
 
-  WCHAR device_name[size];
-  if (GetComputerNameExW(ComputerNameDnsHostname, device_name, &size)) {
+  std::wstring device_name(size, L' ');
+  if (GetComputerNameExW(ComputerNameDnsHostname, device_name.data(), &size)) {
     winrt::hstring device_name_str(device_name);
     return winrt::to_string(device_name_str);
   }
diff --git a/internal/platform/implementation/windows/generated/BUILD b/internal/platform/implementation/windows/generated/BUILD
index 5184c3e5..44b98e29 100644
--- a/internal/platform/implementation/windows/generated/BUILD
+++ b/internal/platform/implementation/windows/generated/BUILD
@@ -15,7 +15,8 @@ licenses(["notice"])
 
 cc_library(
     name = "types",
-    copts = ["-Wno-non-virtual-dtor"],
+    hdrs = glob(["**/*.h"]),
+    includes = ["."],
     linkopts = [
         "wininet.lib",
         "advapi32.lib",
@@ -40,7 +41,6 @@ cc_library(
         "wlanapi.lib",
         "shlwapi.lib",
     ],
-    textual_hdrs = glob(["**/*.h"]),
     visibility = [
         "//fastpair:__subpackages__",
         "//internal:__subpackages__",