From f49fe2fb594c026dc1cd05d7dfa9352187bb6328 Mon Sep 17 00:00:00 2001
From: Nick Bourdakos <bourdakos@google.com>
Date: Thu, 19 Jan 2023 18:44:05 -0800
Subject: [PATCH] Internal change

PiperOrigin-RevId: 503320554
---
 connections/c/strategy_w.cc           |  2 --
 connections/c/strategy_w.h            |  2 +-
 connections/dart/BUILD                | 19 +++++++++++++++++++
 connections/dart/core_adapter_dart.cc |  3 ---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/connections/c/strategy_w.cc b/connections/c/strategy_w.cc
index cce9721b..08e10f45 100644
--- a/connections/c/strategy_w.cc
+++ b/connections/c/strategy_w.cc
@@ -44,8 +44,6 @@ const StrategyW& StrategyW::GetStrategyPointToPoint() {
   return StrategyW::kP2pPointToPoint;
 }
 
-constexpr StrategyW::StrategyW() : StrategyW(kNone) {}
-
 bool StrategyW::IsNone() const { return *this == kNone; }
 
 bool StrategyW::IsValid() const {
diff --git a/connections/c/strategy_w.h b/connections/c/strategy_w.h
index 563b33f1..008a94ba 100644
--- a/connections/c/strategy_w.h
+++ b/connections/c/strategy_w.h
@@ -28,7 +28,7 @@ class DLL_API StrategyW {
   static const StrategyW kP2pCluster;
   static const StrategyW kP2pStar;
   static const StrategyW kP2pPointToPoint;
-  constexpr StrategyW();
+  constexpr StrategyW() : StrategyW(kNone) {}
   constexpr StrategyW(const StrategyW&) = default;
   constexpr StrategyW& operator=(const StrategyW&) = default;
 
diff --git a/connections/dart/BUILD b/connections/dart/BUILD
index 7f077c0f..d1fa824f 100644
--- a/connections/dart/BUILD
+++ b/connections/dart/BUILD
@@ -36,3 +36,22 @@ lexan.cc_windows_dll(
         "//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory",
     ],
 )
+
+objc_library(
+    name = "nearby_connections_objc",
+    srcs = [
+        "core_adapter_dart.cc",
+    ],
+    hdrs = [
+        "core_adapter_dart.h",
+    ],
+    deps = [
+        "//connections:core",
+        "//connections:core_types",
+        "//connections/c",
+        "//internal/platform:types",
+        "//internal/platform/implementation/apple",  # buildcleaner: keep
+        "//third_party/dart_lang/v2:dart_api_dl",
+    ],
+    alwayslink = 1,
+)
diff --git a/connections/dart/core_adapter_dart.cc b/connections/dart/core_adapter_dart.cc
index c4902d3f..11c6409f 100644
--- a/connections/dart/core_adapter_dart.cc
+++ b/connections/dart/core_adapter_dart.cc
@@ -14,8 +14,6 @@
 
 #include "connections/dart/core_adapter_dart.h"
 
-#include <shlobj.h>
-
 #include <cstdint>
 #include <string>
 
@@ -447,7 +445,6 @@ void StartDiscoveryDart(Core *pCore, const char *service_id,
   DiscoveryListenerW listener(ListenerEndpointFoundCB, ListenerEndpointLostCB,
                               ListenerEndpointDistanceChangedCB);
 
-  Status request_result;
   ResultCallbackW callback;
   SetResultCallback(callback, dart_port);