diff --git a/internal/platform/BUILD b/internal/platform/BUILD index 6b7b3aefe4..cd8ca1bdd1 100644 --- a/internal/platform/BUILD +++ b/internal/platform/BUILD @@ -553,7 +553,7 @@ cc_test( "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ diff --git a/internal/platform/implementation/apple/BUILD b/internal/platform/implementation/apple/BUILD index 14912f31d6..c8eabc864a 100644 --- a/internal/platform/implementation/apple/BUILD +++ b/internal/platform/implementation/apple/BUILD @@ -68,7 +68,7 @@ objc_library( "//internal/platform/implementation/shared:file", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ] + select({ - "@platforms//os:platform_ios": [ + "//tools/cc_target_os:platform_ios": [ "//third_party/apple_frameworks:UIKit", ], "//conditions:default": [], diff --git a/internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD b/internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD index 20053ca36c..66a6f2632d 100644 --- a/internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD +++ b/internal/platform/implementation/apple/Mediums/Ble/Sockets/BUILD @@ -55,7 +55,7 @@ objc_library( "//third_party/apple_frameworks:QuartzCore", "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger", ] + select({ - "@platforms//os:platform_ios": [ + "//tools/cc_target_os:platform_ios": [ "//third_party/apple_frameworks:UIKit", ], "//conditions:default": [], diff --git a/internal/proto/credential.proto b/internal/proto/credential.proto index 53506e88ce..14e7ca705c 100644 --- a/internal/proto/credential.proto +++ b/internal/proto/credential.proto @@ -16,7 +16,6 @@ syntax = "proto3"; package nearby.internal; -// option cc_api_version = 2; // option java_api_version = 2; option java_multiple_files = true; option java_package = "com.google.nearby.presence"; diff --git a/presence/BUILD b/presence/BUILD index 81458bb8e3..fcfad15774 100644 --- a/presence/BUILD +++ b/presence/BUILD @@ -143,7 +143,7 @@ cc_test( "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -167,7 +167,7 @@ cc_test( "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -209,7 +209,7 @@ cc_test( "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ diff --git a/presence/fpp/BUILD b/presence/fpp/BUILD index 931c75a25e..a4cc41d8f7 100644 --- a/presence/fpp/BUILD +++ b/presence/fpp/BUILD @@ -60,7 +60,7 @@ cc_test( "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -80,7 +80,7 @@ cc_test( "@com_google_absl//absl/status", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD index 40cd72389d..bee3281c80 100644 --- a/presence/implementation/BUILD +++ b/presence/implementation/BUILD @@ -206,7 +206,7 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -231,7 +231,7 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -253,7 +253,7 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -277,7 +277,7 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -300,7 +300,7 @@ cc_test( "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -321,7 +321,7 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -341,7 +341,7 @@ cc_test( "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -361,7 +361,7 @@ cc_test( "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -384,7 +384,7 @@ cc_test( "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -413,7 +413,7 @@ cc_test( "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -444,7 +444,7 @@ cc_test( "@com_google_absl//absl/types:variant", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ @@ -475,7 +475,7 @@ cc_test( "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ diff --git a/presence/implementation/mediums/BUILD b/presence/implementation/mediums/BUILD index a2592bc74d..9276f7de28 100644 --- a/presence/implementation/mediums/BUILD +++ b/presence/implementation/mediums/BUILD @@ -50,7 +50,7 @@ cc_test( "@com_github_protobuf_matchers//protobuf-matchers", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ diff --git a/sharing/BUILD b/sharing/BUILD index ce0fb7a2c8..2b39436e90 100644 --- a/sharing/BUILD +++ b/sharing/BUILD @@ -461,7 +461,7 @@ cc_test( "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ] + select({ - "@platforms//os:windows": [ + "//tools/cc_target_os:windows": [ "//internal/platform/implementation/windows", ], "//conditions:default": [ diff --git a/sharing/internal/base/BUILD b/sharing/internal/base/BUILD index 6363767533..90aad74195 100644 --- a/sharing/internal/base/BUILD +++ b/sharing/internal/base/BUILD @@ -20,6 +20,7 @@ cc_library( "utf_string_conversions.h", ], visibility = ["//visibility:public"], + deps = ["//sharing/internal/base/strings"], ) cc_library(