switched from using custom linux fork of nearby_connections_service_linux and nearby_sharing_service_linux, switched to google's implementation of nearby sharing service. with appropriate stubs for missing parts

sharing/internal/api/BUILD

@@ -33,7 +33,6 @@ cc_library(
     visibility = [
         "//location/nearby/analytics/cpp/logging:__pkg__",
         "//location/nearby/cpp/sharing:__subpackages__",
-        "//location/nearby/sharing/lib:__subpackages__",
         "//location/nearby/sharing/sdk/test_client:__pkg__",
         "//sharing:__subpackages__",
     ],
@@ -42,9 +41,8 @@ cc_library(
         "//internal/platform:mac_address",
         "//internal/platform:types",
         "//internal/platform/implementation:account_manager",
-        "//location/nearby/sharing/lib/sync:sync_binding_prefs_cc_proto",
-        "//location/nearby/sharing/lib/sync:sync_config_prefs_cc_proto",
         "//sharing/proto:share_cc_proto",
+        "//sharing/proto:wire_format_cc_proto",
         "@com_google_absl//absl/functional:any_invocable",
         "@com_google_absl//absl/strings:string_view",
         "@com_google_absl//absl/time",

sharing/internal/api/preference_manager.h

@@ -32,6 +32,7 @@
 #define NEARBY_HAS_SYNC_CONFIG_PREFS_PROTO 1
 #endif  // __has_include("location/nearby/sharing/lib/sync/sync_config_prefs.pb.h")
 #endif  // defined(__has_include)
+#include "sharing/proto/wire_format.pb.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/span.h"
@@ -41,8 +42,21 @@
 namespace nearby::sharing::sync {
 class SyncConfigPrefs {
  public:
-  bool ParseFromString(const std::string&) { return false; }
-  std::string SerializeAsString() const { return {}; }
+  bool ParseFromString(const std::string& serialized) {
+    return sync_config_.ParseFromString(serialized);
+  }
+  std::string SerializeAsString() const {
+    return sync_config_.SerializeAsString();
+  }
+  const nearby::sharing::service::proto::SyncConfig& sync_config() const {
+    return sync_config_;
+  }
+  nearby::sharing::service::proto::SyncConfig* mutable_sync_config() {
+    return &sync_config_;
+  }
+
+ private:
+  nearby::sharing::service::proto::SyncConfig sync_config_;
 };
 }  // namespace nearby::sharing::sync
 #endif  // NEARBY_HAS_SYNC_CONFIG_PREFS_PROTO

sharing/internal/base/utf_string_conversions.h

@@ -15,31 +15,60 @@
 #ifndef THIRD_PARTY_NEARBY_SHARING_INTERNAL_BASE_UTF_STRING_CONVERSIONS_H_
 #define THIRD_PARTY_NEARBY_SHARING_INTERNAL_BASE_UTF_STRING_CONVERSIONS_H_
 
+#include <string>
+#include <string_view>
+
 #if defined(GITHUB_BUILD)
 // Stub out string conversion functions for github builds.
 namespace nearby::utils {
 
-bool IsStringUtf8(std::string_view str) { return true; }
+inline bool IsStringUtf8(std::string_view str) {
+  static_cast<void>(str);
+  return true;
+}
 
-void TruncateUtf8ToByteSize(const std::string& input, size_t byte_size,
-                            std::string* output) {}
+inline void TruncateUtf8ToByteSize(const std::string& input, size_t byte_size,
+                                   std::string* output) {
+  if (output == nullptr) {
+    return;
+  }
+  *output = input.substr(0, byte_size);
+}
 
 }  // namespace nearby::utils
 #elif defined(NEARBY_CHROMIUM)
 // Forward to chromium implementations.
 #include "base/strings/string_util.h"
 namespace nearby::utils {
-bool IsStringUtf8(std::string_view str) {
+inline bool IsStringUtf8(std::string_view str) {
   return base::IsStringUTF8(str);
 }
 
-void TruncateUtf8ToByteSize(const std::string& input, size_t byte_size,
-                            std::string* output) {
+inline void TruncateUtf8ToByteSize(const std::string& input, size_t byte_size,
+                                   std::string* output) {
   base::TruncateUTF8ToByteSize(input, byte_size, output);
 }
 }  // namespace nearby::utils
-#else  // defined(GITHUB_BUILD)
+#elif defined(__has_include) && \
+    __has_include("sharing/internal/base/strings/utf_string_conversions.h")
 #include "sharing/internal/base/strings/utf_string_conversions.h"  // IWYU pragma: export
+#else
+namespace nearby::utils {
+
+inline bool IsStringUtf8(std::string_view str) {
+  static_cast<void>(str);
+  return true;
+}
+
+inline void TruncateUtf8ToByteSize(const std::string& input, size_t byte_size,
+                                   std::string* output) {
+  if (output == nullptr) {
+    return;
+  }
+  *output = input.substr(0, byte_size);
+}
+
+}  // namespace nearby::utils
 #endif  // defined(GITHUB_BUILD)
 
 #endif  // THIRD_PARTY_NEARBY_SHARING_INTERNAL_BASE_UTF_STRING_CONVERSIONS_H_

sharing/internal/public/BUILD

@@ -22,7 +22,6 @@ cc_library(
     hdrs = [
         "pref_names.h",
     ],
-    compatible_with = ["//buildenv/target:non_prod"],
     visibility = ["//visibility:public"],
     deps = [
         "@com_google_absl//absl/strings",

sharing/internal/test/BUILD

@@ -40,8 +40,6 @@ cc_library(
         "//internal/platform:mac_address",
         "//internal/platform:types",
         "//internal/test",
-        "//location/nearby/sharing/lib/sync:sync_binding_prefs_cc_proto",
-        "//location/nearby/sharing/lib/sync:sync_config_prefs_cc_proto",
         "//sharing/internal/api:platform",
         "//sharing/internal/public:pref_names",
         "//sharing/internal/public:types",

sharing/internal/test/fake_preference_manager.cc

@@ -22,8 +22,6 @@
 #include <variant>
 #include <vector>
 
-#include "location/nearby/sharing/lib/sync/sync_binding_prefs.pb.h"
-#include "location/nearby/sharing/lib/sync/sync_config_prefs.pb.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"

sharing/internal/test/fake_preference_manager.h

@@ -23,8 +23,6 @@
 #include <variant>
 #include <vector>
 
-#include "location/nearby/sharing/lib/sync/sync_binding_prefs.pb.h"
-#include "location/nearby/sharing/lib/sync/sync_config_prefs.pb.h"
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"