Internal change
PiperOrigin-RevId: 364634241
diff --git a/cpp/core/BUILD b/cpp/core/BUILD
index f0b551e..c111f58 100644
--- a/cpp/core/BUILD
+++ b/cpp/core/BUILD
@@ -29,9 +29,9 @@
"//platform/public:comm",
"//platform/public:logging",
"//platform/public:types",
- "//absl/strings",
- "//absl/time",
- "//absl/types:span",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
+ "//third_party/absl/types:span",
],
)
@@ -58,8 +58,8 @@
"//platform/public:logging",
"//platform/public:types",
"//proto:connections_enums_portable_proto",
- "//absl/strings",
- "//absl/types:variant",
+ "//third_party/absl/strings",
+ "//third_party/absl/types:variant",
],
)
@@ -85,8 +85,8 @@
"//platform/public:logging",
"//platform/public:types",
"//testing/base/public:gunit_main",
- "//absl/strings",
- "//absl/time",
- "//absl/types:variant",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
+ "//third_party/absl/types:variant",
],
)
diff --git a/cpp/core/core.cc b/cpp/core/core.cc
index 11dd795..371fbe0 100644
--- a/cpp/core/core.cc
+++ b/cpp/core/core.cc
@@ -20,7 +20,7 @@
#include "core/options.h"
#include "platform/public/count_down_latch.h"
#include "platform/public/logging.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/core.h b/cpp/core/core.h
index e5bf78e..92bf526 100644
--- a/cpp/core/core.h
+++ b/cpp/core/core.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_CORE_H_
-#define CORE_CORE_H_
+#ifndef _CORE_CORE_H_
+#define _CORE_CORE_H_
#include <string>
@@ -24,8 +24,8 @@
#include "core/listeners.h"
#include "core/options.h"
#include "core/params.h"
-#include "absl/strings/string_view.h"
-#include "absl/types/span.h"
+#include "third_party/absl/strings/string_view.h"
+#include "third_party/absl/types/span.h"
namespace location {
namespace nearby {
@@ -244,4 +244,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_CORE_H_
+#endif // _CORE_CORE_H_
diff --git a/cpp/core/core_test.cc b/cpp/core/core_test.cc
index 76cd8f0..05dab03 100644
--- a/cpp/core/core_test.cc
+++ b/cpp/core/core_test.cc
@@ -20,7 +20,7 @@
#include "platform/public/logging.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/BUILD b/cpp/core/internal/BUILD
index 88b74ce..e8282ce 100644
--- a/cpp/core/internal/BUILD
+++ b/cpp/core/internal/BUILD
@@ -102,15 +102,15 @@
"//platform/public:types",
"//proto:connections_enums_portable_proto",
"//securegcm:ukey2",
- "//absl/base:core_headers",
- "//absl/container:btree",
- "//absl/container:flat_hash_map",
- "//absl/container:flat_hash_set",
- "//absl/functional:bind_front",
- "//absl/memory",
- "//absl/strings",
- "//absl/time",
- "//absl/types:span",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/container:btree",
+ "//third_party/absl/container:flat_hash_map",
+ "//third_party/absl/container:flat_hash_set",
+ "//third_party/absl/functional:bind_front",
+ "//third_party/absl/memory",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
+ "//third_party/absl/types:span",
],
)
@@ -149,8 +149,8 @@
"//platform/base:test_util",
"//platform/public:types",
"//testing/base/public:gunit",
- "//absl/functional:bind_front",
- "//absl/strings",
+ "//third_party/absl/functional:bind_front",
+ "//third_party/absl/strings",
],
)
@@ -197,10 +197,10 @@
"//securegcm:ukey2",
"//testing/base/public:gunit",
"//testing/base/public:gunit_main",
- "//absl/container:flat_hash_set",
- "//absl/strings",
- "//absl/synchronization",
- "//absl/time",
- "//absl/types:span",
+ "//third_party/absl/container:flat_hash_set",
+ "//third_party/absl/strings",
+ "//third_party/absl/synchronization",
+ "//third_party/absl/time",
+ "//third_party/absl/types:span",
],
)
diff --git a/cpp/core/internal/base_bwu_handler.h b/cpp/core/internal/base_bwu_handler.h
index 7bcde6f..406f2e9 100644
--- a/cpp/core/internal/base_bwu_handler.h
+++ b/cpp/core/internal/base_bwu_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BASE_BWU_HANDLER_H_
-#define CORE_INTERNAL_BASE_BWU_HANDLER_H_
+#ifndef _CORE_INTERNAL_BASE_BWU_HANDLER_H_
+#define _CORE_INTERNAL_BASE_BWU_HANDLER_H_
#include <cstdint>
#include <memory>
@@ -28,8 +28,8 @@
#include "platform/public/scheduled_executor.h"
#include "platform/public/single_thread_executor.h"
#include "proto/connections_enums.pb.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -57,4 +57,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BASE_BWU_HANDLER_H_
+#endif // _CORE_INTERNAL_BASE_BWU_HANDLER_H_
diff --git a/cpp/core/internal/base_endpoint_channel.cc b/cpp/core/internal/base_endpoint_channel.cc
index 30e8c8b..f3b1cd4 100644
--- a/cpp/core/internal/base_endpoint_channel.cc
+++ b/cpp/core/internal/base_endpoint_channel.cc
@@ -23,8 +23,8 @@
#include "platform/public/mutex.h"
#include "platform/public/mutex_lock.h"
#include "proto/connections_enums.pb.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_cat.h"
+#include "third_party/absl/strings/escaping.h"
+#include "third_party/absl/strings/str_cat.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/base_endpoint_channel.h b/cpp/core/internal/base_endpoint_channel.h
index 5b64170..52b12b8 100644
--- a/cpp/core/internal/base_endpoint_channel.h
+++ b/cpp/core/internal/base_endpoint_channel.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BASE_ENDPOINT_CHANNEL_H_
-#define CORE_INTERNAL_BASE_ENDPOINT_CHANNEL_H_
+#ifndef _CORE_INTERNAL_BASE_ENDPOINT_CHANNEL_H_
+#define _CORE_INTERNAL_BASE_ENDPOINT_CHANNEL_H_
#include <cstdint>
#include <memory>
@@ -29,7 +29,7 @@
#include "platform/public/system_clock.h"
#include "proto/connections_enums.pb.h"
#include "securegcm/d2d_connection_context_v1.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -135,4 +135,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BASE_ENDPOINT_CHANNEL_H_
+#endif // _CORE_INTERNAL_BASE_ENDPOINT_CHANNEL_H_
diff --git a/cpp/core/internal/base_endpoint_channel_test.cc b/cpp/core/internal/base_endpoint_channel_test.cc
index 80668a4..577b5d0 100644
--- a/cpp/core/internal/base_endpoint_channel_test.cc
+++ b/cpp/core/internal/base_endpoint_channel_test.cc
@@ -31,8 +31,8 @@
#include "securegcm/ukey2_handshake.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/time.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/base_pcp_handler.cc b/cpp/core/internal/base_pcp_handler.cc
index 40e2a40..216c840 100644
--- a/cpp/core/internal/base_pcp_handler.cc
+++ b/cpp/core/internal/base_pcp_handler.cc
@@ -28,9 +28,9 @@
#include "platform/public/system_clock.h"
#include "securegcm/d2d_connection_context_v1.h"
#include "securegcm/ukey2_handshake.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/strings/escaping.h"
-#include "absl/types/span.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/strings/escaping.h"
+#include "third_party/absl/types/span.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/base_pcp_handler.h b/cpp/core/internal/base_pcp_handler.h
index 9508cc1..7c55acc 100644
--- a/cpp/core/internal/base_pcp_handler.h
+++ b/cpp/core/internal/base_pcp_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BASE_PCP_HANDLER_H_
-#define CORE_INTERNAL_BASE_PCP_HANDLER_H_
+#ifndef _CORE_INTERNAL_BASE_PCP_HANDLER_H_
+#define _CORE_INTERNAL_BASE_PCP_HANDLER_H_
#include <cstdint>
#include <memory>
@@ -46,9 +46,9 @@
#include "proto/connections_enums.pb.h"
#include "securegcm/d2d_connection_context_v1.h"
#include "securegcm/ukey2_handshake.h"
-#include "absl/container/btree_map.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/time/time.h"
+#include "third_party/absl/container/btree_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
@@ -87,7 +87,7 @@
// Starts advertising. Once successfully started, changes ClientProxy's state.
// Notifies ConnectionListener (info.listener) in case of any event.
// See
- // cpp/core/listeners.h
+ // cpp/core/listeners.h;l=78
Status StartAdvertising(ClientProxy* client, const std::string& service_id,
const ConnectionOptions& options,
const ConnectionRequestInfo& info) override;
@@ -517,4 +517,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BASE_PCP_HANDLER_H_
+#endif // _CORE_INTERNAL_BASE_PCP_HANDLER_H_
diff --git a/cpp/core/internal/base_pcp_handler_test.cc b/cpp/core/internal/base_pcp_handler_test.cc
index fd1ac03..a3c30c4 100644
--- a/cpp/core/internal/base_pcp_handler_test.cc
+++ b/cpp/core/internal/base_pcp_handler_test.cc
@@ -35,7 +35,7 @@
#include "proto/connections_enums.pb.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/ble_advertisement.cc b/cpp/core/internal/ble_advertisement.cc
index 82bc49a..436d14c 100644
--- a/cpp/core/internal/ble_advertisement.cc
+++ b/cpp/core/internal/ble_advertisement.cc
@@ -19,7 +19,7 @@
#include "core/internal/base_pcp_handler.h"
#include "platform/base/base_input_stream.h"
#include "platform/public/logging.h"
-#include "absl/strings/escaping.h"
+#include "third_party/absl/strings/escaping.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/ble_advertisement.h b/cpp/core/internal/ble_advertisement.h
index d4658a4..7b3c5e2 100644
--- a/cpp/core/internal/ble_advertisement.h
+++ b/cpp/core/internal/ble_advertisement.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BLE_ADVERTISEMENT_H_
-#define CORE_INTERNAL_BLE_ADVERTISEMENT_H_
+#ifndef _CORE_INTERNAL_BLE_ADVERTISEMENT_H_
+#define _CORE_INTERNAL_BLE_ADVERTISEMENT_H_
#include "core/internal/base_pcp_handler.h"
#include "core/internal/pcp.h"
@@ -124,4 +124,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BLE_ADVERTISEMENT_H_
+#endif // _CORE_INTERNAL_BLE_ADVERTISEMENT_H_
diff --git a/cpp/core/internal/ble_endpoint_channel.h b/cpp/core/internal/ble_endpoint_channel.h
index 3d35890..88d6879 100644
--- a/cpp/core/internal/ble_endpoint_channel.h
+++ b/cpp/core/internal/ble_endpoint_channel.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BLE_ENDPOINT_CHANNEL_H_
-#define CORE_INTERNAL_BLE_ENDPOINT_CHANNEL_H_
+#ifndef _CORE_INTERNAL_BLE_ENDPOINT_CHANNEL_H_
+#define _CORE_INTERNAL_BLE_ENDPOINT_CHANNEL_H_
#include "core/internal/base_endpoint_channel.h"
#include "platform/public/ble.h"
@@ -44,4 +44,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BLE_ENDPOINT_CHANNEL_H_
+#endif // _CORE_INTERNAL_BLE_ENDPOINT_CHANNEL_H_
diff --git a/cpp/core/internal/bluetooth_bwu_handler.cc b/cpp/core/internal/bluetooth_bwu_handler.cc
index efbe1c5..4014848 100644
--- a/cpp/core/internal/bluetooth_bwu_handler.cc
+++ b/cpp/core/internal/bluetooth_bwu_handler.cc
@@ -17,7 +17,7 @@
#include "core/internal/bluetooth_endpoint_channel.h"
#include "core/internal/client_proxy.h"
#include "core/internal/offline_frames.h"
-#include "absl/functional/bind_front.h"
+#include "third_party/absl/functional/bind_front.h"
// Manages the Bluetooth-specific methods needed to upgrade an {@link
// EndpointChannel}.
diff --git a/cpp/core/internal/bluetooth_bwu_handler.h b/cpp/core/internal/bluetooth_bwu_handler.h
index 172d9f5..5c678fe 100644
--- a/cpp/core/internal/bluetooth_bwu_handler.h
+++ b/cpp/core/internal/bluetooth_bwu_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BLUETOOTH_BWU_HANDLER_H_
-#define CORE_INTERNAL_BLUETOOTH_BWU_HANDLER_H_
+#ifndef _CORE_INTERNAL_BLUETOOTH_BWU_HANDLER_H_
+#define _CORE_INTERNAL_BLUETOOTH_BWU_HANDLER_H_
#include <string>
@@ -94,4 +94,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BLUETOOTH_BWU_HANDLER_H_
+#endif // _CORE_INTERNAL_BLUETOOTH_BWU_HANDLER_H_
diff --git a/cpp/core/internal/bluetooth_device_name.cc b/cpp/core/internal/bluetooth_device_name.cc
index 49e7838..f379e29 100644
--- a/cpp/core/internal/bluetooth_device_name.cc
+++ b/cpp/core/internal/bluetooth_device_name.cc
@@ -22,8 +22,8 @@
#include "platform/base/base64_utils.h"
#include "platform/base/base_input_stream.h"
#include "platform/public/logging.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_cat.h"
+#include "third_party/absl/strings/escaping.h"
+#include "third_party/absl/strings/str_cat.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/bluetooth_device_name.h b/cpp/core/internal/bluetooth_device_name.h
index a2ce550..27f1e0a 100644
--- a/cpp/core/internal/bluetooth_device_name.h
+++ b/cpp/core/internal/bluetooth_device_name.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BLUETOOTH_DEVICE_NAME_H_
-#define CORE_INTERNAL_BLUETOOTH_DEVICE_NAME_H_
+#ifndef _CORE_INTERNAL_BLUETOOTH_DEVICE_NAME_H_
+#define _CORE_INTERNAL_BLUETOOTH_DEVICE_NAME_H_
#include <cstdint>
#include "core/internal/base_pcp_handler.h"
#include "core/internal/pcp.h"
#include "platform/base/byte_array.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -91,4 +91,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BLUETOOTH_DEVICE_NAME_H_
+#endif // _CORE_INTERNAL_BLUETOOTH_DEVICE_NAME_H_
diff --git a/cpp/core/internal/bluetooth_endpoint_channel.h b/cpp/core/internal/bluetooth_endpoint_channel.h
index 06b9195..a58c3a8 100644
--- a/cpp/core/internal/bluetooth_endpoint_channel.h
+++ b/cpp/core/internal/bluetooth_endpoint_channel.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BLUETOOTH_ENDPOINT_CHANNEL_H_
-#define CORE_INTERNAL_BLUETOOTH_ENDPOINT_CHANNEL_H_
+#ifndef _CORE_INTERNAL_BLUETOOTH_ENDPOINT_CHANNEL_H_
+#define _CORE_INTERNAL_BLUETOOTH_ENDPOINT_CHANNEL_H_
#include <string>
@@ -47,4 +47,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BLUETOOTH_ENDPOINT_CHANNEL_H_
+#endif // _CORE_INTERNAL_BLUETOOTH_ENDPOINT_CHANNEL_H_
diff --git a/cpp/core/internal/bwu_handler.h b/cpp/core/internal/bwu_handler.h
index 1297c9b..297481b 100644
--- a/cpp/core/internal/bwu_handler.h
+++ b/cpp/core/internal/bwu_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BWU_HANDLER_H_
-#define CORE_INTERNAL_BWU_HANDLER_H_
+#ifndef _CORE_INTERNAL_BWU_HANDLER_H_
+#define _CORE_INTERNAL_BWU_HANDLER_H_
#include "core/internal/client_proxy.h"
#include "core/internal/endpoint_channel.h"
@@ -87,4 +87,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BWU_HANDLER_H_
+#endif // _CORE_INTERNAL_BWU_HANDLER_H_
diff --git a/cpp/core/internal/bwu_manager.cc b/cpp/core/internal/bwu_manager.cc
index 51ef194..e3a5bf7 100644
--- a/cpp/core/internal/bwu_manager.cc
+++ b/cpp/core/internal/bwu_manager.cc
@@ -26,8 +26,8 @@
#include "platform/base/feature_flags.h"
#include "platform/public/count_down_latch.h"
#include "proto/connections_enums.pb.h"
-#include "absl/functional/bind_front.h"
-#include "absl/time/time.h"
+#include "third_party/absl/functional/bind_front.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/bwu_manager.h b/cpp/core/internal/bwu_manager.h
index 2ba3766..e9cf6f8 100644
--- a/cpp/core/internal/bwu_manager.h
+++ b/cpp/core/internal/bwu_manager.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_BWU_MANAGER_H_
-#define CORE_INTERNAL_BWU_MANAGER_H_
+#ifndef _CORE_INTERNAL_BWU_MANAGER_H_
+#define _CORE_INTERNAL_BWU_MANAGER_H_
#include <memory>
#include <string>
@@ -28,9 +28,9 @@
#include "platform/base/byte_array.h"
#include "platform/public/scheduled_executor.h"
#include "proto/connections_enums.pb.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/time/time.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
@@ -193,4 +193,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_BWU_MANAGER_H_
+#endif // _CORE_INTERNAL_BWU_MANAGER_H_
diff --git a/cpp/core/internal/bwu_manager_test.cc b/cpp/core/internal/bwu_manager_test.cc
index 255068b..ae74ad4 100644
--- a/cpp/core/internal/bwu_manager_test.cc
+++ b/cpp/core/internal/bwu_manager_test.cc
@@ -25,7 +25,7 @@
#include "platform/public/system_clock.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/client_proxy.cc b/cpp/core/internal/client_proxy.cc
index 3d63d8d..8f069a0 100644
--- a/cpp/core/internal/client_proxy.cc
+++ b/cpp/core/internal/client_proxy.cc
@@ -25,10 +25,10 @@
#include "platform/public/logging.h"
#include "platform/public/mutex_lock.h"
#include "proto/connections_enums.pb.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_cat.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/strings/escaping.h"
+#include "third_party/absl/strings/str_cat.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/client_proxy.h b/cpp/core/internal/client_proxy.h
index 9ecb6b2..2326b5c 100644
--- a/cpp/core/internal/client_proxy.h
+++ b/cpp/core/internal/client_proxy.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_CLIENT_PROXY_H_
-#define CORE_INTERNAL_CLIENT_PROXY_H_
+#ifndef _CORE_INTERNAL_CLIENT_PROXY_H_
+#define _CORE_INTERNAL_CLIENT_PROXY_H_
#include <cstdint>
#include <string>
@@ -31,9 +31,9 @@
#include "proto/connections_enums.pb.h"
// Prefer using absl:: versions of a set and a map; they tend to be more
// efficient: implementation is using open-addressing hash tables.
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/types/span.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/types/span.h"
namespace location {
namespace nearby {
@@ -307,4 +307,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_CLIENT_PROXY_H_
+#endif // _CORE_INTERNAL_CLIENT_PROXY_H_
diff --git a/cpp/core/internal/client_proxy_test.cc b/cpp/core/internal/client_proxy_test.cc
index 7d19675..9d845d7 100644
--- a/cpp/core/internal/client_proxy_test.cc
+++ b/cpp/core/internal/client_proxy_test.cc
@@ -24,10 +24,10 @@
#include "platform/base/medium_environment.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
-#include "absl/types/span.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/time/time.h"
+#include "third_party/absl/types/span.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/encryption_runner.cc b/cpp/core/internal/encryption_runner.cc
index 24832a6..4c62a27 100644
--- a/cpp/core/internal/encryption_runner.cc
+++ b/cpp/core/internal/encryption_runner.cc
@@ -24,9 +24,9 @@
#include "platform/public/cancelable_alarm.h"
#include "platform/public/logging.h"
#include "securegcm/ukey2_handshake.h"
-#include "absl/strings/ascii.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
+#include "third_party/absl/strings/ascii.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/encryption_runner.h b/cpp/core/internal/encryption_runner.h
index bc1b4cf..3549b37 100644
--- a/cpp/core/internal/encryption_runner.h
+++ b/cpp/core/internal/encryption_runner.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_ENCRYPTION_RUNNER_H_
-#define CORE_INTERNAL_ENCRYPTION_RUNNER_H_
+#ifndef _CORE_INTERNAL_ENCRYPTION_RUNNER_H_
+#define _CORE_INTERNAL_ENCRYPTION_RUNNER_H_
#include <string>
@@ -83,4 +83,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_ENCRYPTION_RUNNER_H_
+#endif // _CORE_INTERNAL_ENCRYPTION_RUNNER_H_
diff --git a/cpp/core/internal/encryption_runner_test.cc b/cpp/core/internal/encryption_runner_test.cc
index 2dc3cfc..7b36fe4 100644
--- a/cpp/core/internal/encryption_runner_test.cc
+++ b/cpp/core/internal/encryption_runner_test.cc
@@ -23,7 +23,7 @@
#include "proto/connections_enums.pb.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/endpoint_channel.h b/cpp/core/internal/endpoint_channel.h
index 02b9c0d..8040269 100644
--- a/cpp/core/internal/endpoint_channel.h
+++ b/cpp/core/internal/endpoint_channel.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_ENDPOINT_CHANNEL_H_
-#define CORE_INTERNAL_ENDPOINT_CHANNEL_H_
+#ifndef _CORE_INTERNAL_ENDPOINT_CHANNEL_H_
+#define _CORE_INTERNAL_ENDPOINT_CHANNEL_H_
#include <cstdint>
#include <string>
@@ -23,7 +23,7 @@
#include "platform/public/mutex.h"
#include "proto/connections_enums.pb.h"
#include "securegcm/d2d_connection_context_v1.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -94,4 +94,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_ENDPOINT_CHANNEL_H_
+#endif // _CORE_INTERNAL_ENDPOINT_CHANNEL_H_
diff --git a/cpp/core/internal/endpoint_channel_manager.cc b/cpp/core/internal/endpoint_channel_manager.cc
index f099fa5..f24038a 100644
--- a/cpp/core/internal/endpoint_channel_manager.cc
+++ b/cpp/core/internal/endpoint_channel_manager.cc
@@ -23,7 +23,7 @@
#include "platform/public/mutex.h"
#include "platform/public/mutex_lock.h"
#include "platform/public/system_clock.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/endpoint_channel_manager.h b/cpp/core/internal/endpoint_channel_manager.h
index fc30e24..fc8b6fa 100644
--- a/cpp/core/internal/endpoint_channel_manager.h
+++ b/cpp/core/internal/endpoint_channel_manager.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_ENDPOINT_CHANNEL_MANAGER_H_
-#define CORE_INTERNAL_ENDPOINT_CHANNEL_MANAGER_H_
+#ifndef _CORE_INTERNAL_ENDPOINT_CHANNEL_MANAGER_H_
+#define _CORE_INTERNAL_ENDPOINT_CHANNEL_MANAGER_H_
#include <memory>
#include <string>
@@ -23,7 +23,7 @@
#include "platform/public/logging.h"
#include "platform/public/mutex.h"
#include "securegcm/d2d_connection_context_v1.h"
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -169,4 +169,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_ENDPOINT_CHANNEL_MANAGER_H_
+#endif // _CORE_INTERNAL_ENDPOINT_CHANNEL_MANAGER_H_
diff --git a/cpp/core/internal/endpoint_manager.h b/cpp/core/internal/endpoint_manager.h
index 02c0a7c..7a3a7c4 100644
--- a/cpp/core/internal/endpoint_manager.h
+++ b/cpp/core/internal/endpoint_manager.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_ENDPOINT_MANAGER_H_
-#define CORE_INTERNAL_ENDPOINT_MANAGER_H_
+#ifndef _CORE_INTERNAL_ENDPOINT_MANAGER_H_
+#define _CORE_INTERNAL_ENDPOINT_MANAGER_H_
#include <cstdint>
#include <memory>
@@ -30,9 +30,9 @@
#include "platform/public/single_thread_executor.h"
#include "platform/public/system_clock.h"
#include "proto/connections_enums.pb.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/time/time.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
@@ -255,4 +255,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_ENDPOINT_MANAGER_H_
+#endif // _CORE_INTERNAL_ENDPOINT_MANAGER_H_
diff --git a/cpp/core/internal/endpoint_manager_test.cc b/cpp/core/internal/endpoint_manager_test.cc
index e5e1b7a..a58f2c5 100644
--- a/cpp/core/internal/endpoint_manager_test.cc
+++ b/cpp/core/internal/endpoint_manager_test.cc
@@ -29,9 +29,9 @@
#include "proto/connections_enums.pb.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/injected_bluetooth_device_store.h b/cpp/core/internal/injected_bluetooth_device_store.h
index c2805c8..f409bec 100644
--- a/cpp/core/internal/injected_bluetooth_device_store.h
+++ b/cpp/core/internal/injected_bluetooth_device_store.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_INJECTED_BLUETOOTH_DEVICE_STORE_H_
-#define CORE_INTERNAL_INJECTED_BLUETOOTH_DEVICE_STORE_H_
+#ifndef _CORE_INTERNAL_INJECTED_BLUETOOTH_DEVICE_STORE_H_
+#define _CORE_INTERNAL_INJECTED_BLUETOOTH_DEVICE_STORE_H_
#include <memory>
#include <vector>
@@ -68,4 +68,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_INJECTED_BLUETOOTH_DEVICE_STORE_H_
+#endif // _CORE_INTERNAL_INJECTED_BLUETOOTH_DEVICE_STORE_H_
diff --git a/cpp/core/internal/internal_payload.h b/cpp/core/internal/internal_payload.h
index 8861f17..4185878 100644
--- a/cpp/core/internal/internal_payload.h
+++ b/cpp/core/internal/internal_payload.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_INTERNAL_PAYLOAD_H_
-#define CORE_INTERNAL_INTERNAL_PAYLOAD_H_
+#ifndef _CORE_INTERNAL_INTERNAL_PAYLOAD_H_
+#define _CORE_INTERNAL_INTERNAL_PAYLOAD_H_
#include <cstdint>
@@ -96,4 +96,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_INTERNAL_PAYLOAD_H_
+#endif // _CORE_INTERNAL_INTERNAL_PAYLOAD_H_
diff --git a/cpp/core/internal/internal_payload_factory.cc b/cpp/core/internal/internal_payload_factory.cc
index 070bd51..eeb99b7 100644
--- a/cpp/core/internal/internal_payload_factory.cc
+++ b/cpp/core/internal/internal_payload_factory.cc
@@ -25,7 +25,7 @@
#include "platform/public/logging.h"
#include "platform/public/mutex.h"
#include "platform/public/pipe.h"
-#include "absl/memory/memory.h"
+#include "third_party/absl/memory/memory.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/internal_payload_factory.h b/cpp/core/internal/internal_payload_factory.h
index cd7efc5..5254a0f 100644
--- a/cpp/core/internal/internal_payload_factory.h
+++ b/cpp/core/internal/internal_payload_factory.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_INTERNAL_PAYLOAD_FACTORY_H_
-#define CORE_INTERNAL_INTERNAL_PAYLOAD_FACTORY_H_
+#ifndef _CORE_INTERNAL_INTERNAL_PAYLOAD_FACTORY_H_
+#define _CORE_INTERNAL_INTERNAL_PAYLOAD_FACTORY_H_
#include "core/internal/internal_payload.h"
#include "core/payload.h"
@@ -35,4 +35,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_INTERNAL_PAYLOAD_FACTORY_H_
+#endif // _CORE_INTERNAL_INTERNAL_PAYLOAD_FACTORY_H_
diff --git a/cpp/core/internal/mediums/BUILD b/cpp/core/internal/mediums/BUILD
index 9a721a3..f248ee5 100644
--- a/cpp/core/internal/mediums/BUILD
+++ b/cpp/core/internal/mediums/BUILD
@@ -50,15 +50,15 @@
"//platform/public:logging",
"//platform/public:types",
"//location/nearby/mediums/proto:web_rtc_signaling_frames_cc_proto",
- "//absl/container:flat_hash_map",
- "//absl/container:flat_hash_set",
- "//absl/functional:bind_front",
- "//absl/numeric:int128",
- "//absl/strings",
- "//absl/time",
- "//smhasher:libmurmur3",
- "//webrtc/api:libjingle_peerconnection_api",
- "//webrtc/api:scoped_refptr",
+ "//third_party/absl/container:flat_hash_map",
+ "//third_party/absl/container:flat_hash_set",
+ "//third_party/absl/functional:bind_front",
+ "//third_party/absl/numeric:int128",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
+ "//third_party/smhasher:libmurmur3",
+ "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
+ "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr",
],
)
@@ -98,8 +98,8 @@
"//platform/public:comm",
"//platform/public:types",
"//testing/base/public:gunit_main",
- "//absl/strings",
- "//absl/time",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
],
)
@@ -119,6 +119,6 @@
"//platform/impl/g3", # build_cleaner: keep
"//platform/public:types",
"//testing/base/public:gunit_main",
- "//absl/strings",
+ "//third_party/absl/strings",
],
)
diff --git a/cpp/core/internal/mediums/ble.cc b/cpp/core/internal/mediums/ble.cc
index 841d04a..29fcb9f 100644
--- a/cpp/core/internal/mediums/ble.cc
+++ b/cpp/core/internal/mediums/ble.cc
@@ -23,7 +23,7 @@
#include "platform/base/prng.h"
#include "platform/public/logging.h"
#include "platform/public/mutex_lock.h"
-#include "absl/strings/escaping.h"
+#include "third_party/absl/strings/escaping.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/ble.h b/cpp/core/internal/mediums/ble.h
index b826377..11526d0 100644
--- a/cpp/core/internal/mediums/ble.h
+++ b/cpp/core/internal/mediums/ble.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLE_H_
-#define CORE_INTERNAL_MEDIUMS_BLE_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLE_H_
+#define _CORE_INTERNAL_MEDIUMS_BLE_H_
#include <cstdint>
#include <string>
@@ -25,8 +25,8 @@
#include "platform/public/ble.h"
#include "platform/public/multi_thread_executor.h"
#include "platform/public/mutex.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
namespace location {
namespace nearby {
@@ -185,4 +185,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLE_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLE_H_
diff --git a/cpp/core/internal/mediums/ble_v2/BUILD b/cpp/core/internal/mediums/ble_v2/BUILD
index 10b1aaf..ff484f3 100644
--- a/cpp/core/internal/mediums/ble_v2/BUILD
+++ b/cpp/core/internal/mediums/ble_v2/BUILD
@@ -37,10 +37,10 @@
"//platform/base:util",
"//platform/public:logging",
"//platform/public:types",
- "//absl/container:flat_hash_map",
- "//absl/container:flat_hash_set",
- "//absl/strings",
- "//absl/time",
+ "//third_party/absl/container:flat_hash_map",
+ "//third_party/absl/container:flat_hash_set",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
],
)
@@ -58,6 +58,6 @@
"//platform/base",
"//platform/impl/g3", # buildcleaner: keep
"//testing/base/public:gunit_main",
- "//absl/time",
+ "//third_party/absl/time",
],
)
diff --git a/cpp/core/internal/mediums/ble_v2/advertisement_read_result.cc b/cpp/core/internal/mediums/ble_v2/advertisement_read_result.cc
index bf1328c..da21b10 100644
--- a/cpp/core/internal/mediums/ble_v2/advertisement_read_result.cc
+++ b/cpp/core/internal/mediums/ble_v2/advertisement_read_result.cc
@@ -18,8 +18,8 @@
#include <vector>
#include "platform/public/mutex_lock.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/ble_v2/advertisement_read_result.h b/cpp/core/internal/mediums/ble_v2/advertisement_read_result.h
index 03c97d2..f06413f 100644
--- a/cpp/core/internal/mediums/ble_v2/advertisement_read_result.h
+++ b/cpp/core/internal/mediums/ble_v2/advertisement_read_result.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLE_V2_ADVERTISEMENT_READ_RESULT_H_
-#define CORE_INTERNAL_MEDIUMS_BLE_V2_ADVERTISEMENT_READ_RESULT_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLE_V2_ADVERTISEMENT_READ_RESULT_H_
+#define _CORE_INTERNAL_MEDIUMS_BLE_V2_ADVERTISEMENT_READ_RESULT_H_
#include <cstdint>
#include <vector>
@@ -21,9 +21,9 @@
#include "platform/base/byte_array.h"
#include "platform/public/mutex.h"
#include "platform/public/system_clock.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -101,4 +101,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLE_V2_ADVERTISEMENT_READ_RESULT_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLE_V2_ADVERTISEMENT_READ_RESULT_H_
diff --git a/cpp/core/internal/mediums/ble_v2/advertisement_read_result_test.cc b/cpp/core/internal/mediums/ble_v2/advertisement_read_result_test.cc
index 90ce51c..4f40bcb 100644
--- a/cpp/core/internal/mediums/ble_v2/advertisement_read_result_test.cc
+++ b/cpp/core/internal/mediums/ble_v2/advertisement_read_result_test.cc
@@ -15,7 +15,7 @@
#include "core/internal/mediums/ble_v2/advertisement_read_result.h"
#include "gtest/gtest.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/ble_v2/ble_advertisement.cc b/cpp/core/internal/mediums/ble_v2/ble_advertisement.cc
index a2afa60..1701032 100644
--- a/cpp/core/internal/mediums/ble_v2/ble_advertisement.cc
+++ b/cpp/core/internal/mediums/ble_v2/ble_advertisement.cc
@@ -18,7 +18,7 @@
#include "platform/base/base_input_stream.h"
#include "platform/public/logging.h"
-#include "absl/strings/str_cat.h"
+#include "third_party/absl/strings/str_cat.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/ble_v2/ble_advertisement.h b/cpp/core/internal/mediums/ble_v2/ble_advertisement.h
index 176f4bf..5562fce 100644
--- a/cpp/core/internal/mediums/ble_v2/ble_advertisement.h
+++ b/cpp/core/internal/mediums/ble_v2/ble_advertisement.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_H_
-#define CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_H_
+#define _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_H_
#include <utility>
@@ -136,4 +136,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_H_
diff --git a/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.cc b/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.cc
index 704e01b..ec3e64c 100644
--- a/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.cc
+++ b/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.cc
@@ -19,7 +19,7 @@
#include "platform/base/base64_utils.h"
#include "platform/base/base_input_stream.h"
#include "platform/public/logging.h"
-#include "absl/strings/str_cat.h"
+#include "third_party/absl/strings/str_cat.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.h b/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.h
index fbf0d45..a3413b8 100644
--- a/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.h
+++ b/cpp/core/internal/mediums/ble_v2/ble_advertisement_header.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_HEADER_H_
-#define CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_HEADER_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_HEADER_H_
+#define _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_HEADER_H_
#include <string>
@@ -94,4 +94,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_HEADER_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_ADVERTISEMENT_HEADER_H_
diff --git a/cpp/core/internal/mediums/ble_v2/ble_packet.cc b/cpp/core/internal/mediums/ble_v2/ble_packet.cc
index 1eddf09..2df2cc7 100644
--- a/cpp/core/internal/mediums/ble_v2/ble_packet.cc
+++ b/cpp/core/internal/mediums/ble_v2/ble_packet.cc
@@ -16,7 +16,7 @@
#include "platform/base/base_input_stream.h"
#include "platform/public/logging.h"
-#include "absl/strings/str_cat.h"
+#include "third_party/absl/strings/str_cat.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/ble_v2/ble_packet.h b/cpp/core/internal/mediums/ble_v2/ble_packet.h
index b559d4a..04422a8 100644
--- a/cpp/core/internal/mediums/ble_v2/ble_packet.h
+++ b/cpp/core/internal/mediums/ble_v2/ble_packet.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PACKET_H_
-#define CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PACKET_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PACKET_H_
+#define _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PACKET_H_
#include <limits>
@@ -61,4 +61,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PACKET_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PACKET_H_
diff --git a/cpp/core/internal/mediums/ble_v2/ble_peripheral.h b/cpp/core/internal/mediums/ble_v2/ble_peripheral.h
index e3b51a4..816fd3b 100644
--- a/cpp/core/internal/mediums/ble_v2/ble_peripheral.h
+++ b/cpp/core/internal/mediums/ble_v2/ble_peripheral.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PERIPHERAL_H_
-#define CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PERIPHERAL_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PERIPHERAL_H_
+#define _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PERIPHERAL_H_
#include "platform/base/byte_array.h"
@@ -46,4 +46,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PERIPHERAL_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLE_V2_BLE_PERIPHERAL_H_
diff --git a/cpp/core/internal/mediums/ble_v2/discovered_peripheral_callback.h b/cpp/core/internal/mediums/ble_v2/discovered_peripheral_callback.h
index 8aacfed..5fffcc3 100644
--- a/cpp/core/internal/mediums/ble_v2/discovered_peripheral_callback.h
+++ b/cpp/core/internal/mediums/ble_v2/discovered_peripheral_callback.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLE_V2_DISCOVERED_PERIPHERAL_CALLBACK_H_
-#define CORE_INTERNAL_MEDIUMS_BLE_V2_DISCOVERED_PERIPHERAL_CALLBACK_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLE_V2_DISCOVERED_PERIPHERAL_CALLBACK_H_
+#define _CORE_INTERNAL_MEDIUMS_BLE_V2_DISCOVERED_PERIPHERAL_CALLBACK_H_
#include "core/internal/mediums/ble_v2/ble_peripheral.h"
#include "core/listeners.h"
@@ -42,4 +42,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLE_V2_DISCOVERED_PERIPHERAL_CALLBACK_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLE_V2_DISCOVERED_PERIPHERAL_CALLBACK_H_
diff --git a/cpp/core/internal/mediums/bloom_filter.cc b/cpp/core/internal/mediums/bloom_filter.cc
index 20a2370..46dda67 100644
--- a/cpp/core/internal/mediums/bloom_filter.cc
+++ b/cpp/core/internal/mediums/bloom_filter.cc
@@ -14,9 +14,9 @@
#include "core/internal/mediums/bloom_filter.h"
-#include "absl/numeric/int128.h"
-#include "absl/strings/numbers.h"
-#include "smhasher/src/MurmurHash3.h"
+#include "third_party/absl/numeric/int128.h"
+#include "third_party/absl/strings/numbers.h"
+#include "third_party/smhasher/src/MurmurHash3.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/bloom_filter.h b/cpp/core/internal/mediums/bloom_filter.h
index 3d3f45c..e5f19c5 100644
--- a/cpp/core/internal/mediums/bloom_filter.h
+++ b/cpp/core/internal/mediums/bloom_filter.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLOOM_FILTER_H_
-#define CORE_INTERNAL_MEDIUMS_BLOOM_FILTER_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLOOM_FILTER_H_
+#define _CORE_INTERNAL_MEDIUMS_BLOOM_FILTER_H_
#include <bitset>
#include <vector>
@@ -98,4 +98,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLOOM_FILTER_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLOOM_FILTER_H_
diff --git a/cpp/core/internal/mediums/bluetooth_classic.h b/cpp/core/internal/mediums/bluetooth_classic.h
index 45c6626..cb85815 100644
--- a/cpp/core/internal/mediums/bluetooth_classic.h
+++ b/cpp/core/internal/mediums/bluetooth_classic.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLUETOOTH_CLASSIC_H_
-#define CORE_INTERNAL_MEDIUMS_BLUETOOTH_CLASSIC_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLUETOOTH_CLASSIC_H_
+#define _CORE_INTERNAL_MEDIUMS_BLUETOOTH_CLASSIC_H_
#include <cstdint>
#include <string>
@@ -26,7 +26,7 @@
#include "platform/public/bluetooth_classic.h"
#include "platform/public/multi_thread_executor.h"
#include "platform/public/mutex.h"
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -207,4 +207,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLUETOOTH_CLASSIC_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLUETOOTH_CLASSIC_H_
diff --git a/cpp/core/internal/mediums/bluetooth_classic_test.cc b/cpp/core/internal/mediums/bluetooth_classic_test.cc
index 8772c57..2291db8 100644
--- a/cpp/core/internal/mediums/bluetooth_classic_test.cc
+++ b/cpp/core/internal/mediums/bluetooth_classic_test.cc
@@ -24,7 +24,7 @@
#include "platform/public/system_clock.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/bluetooth_radio.h b/cpp/core/internal/mediums/bluetooth_radio.h
index 31cd673..10026d9 100644
--- a/cpp/core/internal/mediums/bluetooth_radio.h
+++ b/cpp/core/internal/mediums/bluetooth_radio.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_BLUETOOTH_RADIO_H_
-#define CORE_INTERNAL_MEDIUMS_BLUETOOTH_RADIO_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_BLUETOOTH_RADIO_H_
+#define _CORE_INTERNAL_MEDIUMS_BLUETOOTH_RADIO_H_
#include <cstdint>
#include "platform/public/atomic_boolean.h"
#include "platform/public/bluetooth_adapter.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -91,4 +91,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_BLUETOOTH_RADIO_H_
+#endif // _CORE_INTERNAL_MEDIUMS_BLUETOOTH_RADIO_H_
diff --git a/cpp/core/internal/mediums/lost_entity_tracker.h b/cpp/core/internal/mediums/lost_entity_tracker.h
index 024cb1c..ca9cafe 100644
--- a/cpp/core/internal/mediums/lost_entity_tracker.h
+++ b/cpp/core/internal/mediums/lost_entity_tracker.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_LOST_ENTITY_TRACKER_H_
-#define CORE_INTERNAL_MEDIUMS_LOST_ENTITY_TRACKER_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_LOST_ENTITY_TRACKER_H_
+#define _CORE_INTERNAL_MEDIUMS_LOST_ENTITY_TRACKER_H_
#include "platform/public/mutex.h"
#include "platform/public/mutex_lock.h"
-#include "absl/container/flat_hash_set.h"
+#include "third_party/absl/container/flat_hash_set.h"
namespace location {
namespace nearby {
@@ -91,4 +91,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_LOST_ENTITY_TRACKER_H_
+#endif // _CORE_INTERNAL_MEDIUMS_LOST_ENTITY_TRACKER_H_
diff --git a/cpp/core/internal/mediums/mediums.h b/cpp/core/internal/mediums/mediums.h
index 4c6127e..c67bd7e 100644
--- a/cpp/core/internal/mediums/mediums.h
+++ b/cpp/core/internal/mediums/mediums.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_MEDIUMS_H_
-#define CORE_INTERNAL_MEDIUMS_MEDIUMS_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_MEDIUMS_H_
+#define _CORE_INTERNAL_MEDIUMS_MEDIUMS_H_
#include "core/internal/mediums/ble.h"
#include "core/internal/mediums/bluetooth_classic.h"
@@ -66,4 +66,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_MEDIUMS_H_
+#endif // _CORE_INTERNAL_MEDIUMS_MEDIUMS_H_
diff --git a/cpp/core/internal/mediums/utils.h b/cpp/core/internal/mediums/utils.h
index 28f275c..1fcb019 100644
--- a/cpp/core/internal/mediums/utils.h
+++ b/cpp/core/internal/mediums/utils.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_UTILS_H_
-#define CORE_INTERNAL_MEDIUMS_UTILS_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_UTILS_H_
+#define _CORE_INTERNAL_MEDIUMS_UTILS_H_
#include <memory>
@@ -39,4 +39,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_UTILS_H_
+#endif // _CORE_INTERNAL_MEDIUMS_UTILS_H_
diff --git a/cpp/core/internal/mediums/uuid.h b/cpp/core/internal/mediums/uuid.h
index 0cfb7ca..8baa22f 100644
--- a/cpp/core/internal/mediums/uuid.h
+++ b/cpp/core/internal/mediums/uuid.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_UUID_H_
-#define CORE_INTERNAL_MEDIUMS_UUID_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_UUID_H_
+#define _CORE_INTERNAL_MEDIUMS_UUID_H_
#include <cstdint>
#include <string>
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -56,4 +56,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_UUID_H_
+#endif // _CORE_INTERNAL_MEDIUMS_UUID_H_
diff --git a/cpp/core/internal/mediums/webrtc.cc b/cpp/core/internal/mediums/webrtc.cc
index 1c83941..9ab94f0 100644
--- a/cpp/core/internal/mediums/webrtc.cc
+++ b/cpp/core/internal/mediums/webrtc.cc
@@ -27,10 +27,10 @@
#include "platform/public/logging.h"
#include "platform/public/mutex_lock.h"
#include "location/nearby/mediums/proto/web_rtc_signaling_frames.pb.h"
-#include "absl/functional/bind_front.h"
-#include "absl/strings/str_cat.h"
-#include "absl/time/time.h"
-#include "webrtc/api/jsep.h"
+#include "third_party/absl/functional/bind_front.h"
+#include "third_party/absl/strings/str_cat.h"
+#include "third_party/absl/time/time.h"
+#include "third_party/webrtc/files/stable/webrtc/api/jsep.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/webrtc.h b/cpp/core/internal/mediums/webrtc.h
index ac3ae2c..f4866a1 100644
--- a/cpp/core/internal/mediums/webrtc.h
+++ b/cpp/core/internal/mediums/webrtc.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_H_
#include <cstddef>
#include <memory>
@@ -39,11 +39,11 @@
#include "platform/public/single_thread_executor.h"
#include "platform/public/webrtc.h"
#include "location/nearby/mediums/proto/web_rtc_signaling_frames.pb.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "webrtc/api/data_channel_interface.h"
-#include "webrtc/api/jsep.h"
-#include "webrtc/api/scoped_refptr.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/webrtc/files/stable/webrtc/api/data_channel_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/jsep.h"
+#include "third_party/webrtc/files/stable/webrtc/api/scoped_refptr.h"
namespace location {
namespace nearby {
@@ -277,4 +277,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_H_
diff --git a/cpp/core/internal/mediums/webrtc/BUILD b/cpp/core/internal/mediums/webrtc/BUILD
index a310c2a..5a220e7 100644
--- a/cpp/core/internal/mediums/webrtc/BUILD
+++ b/cpp/core/internal/mediums/webrtc/BUILD
@@ -45,10 +45,10 @@
"//platform/public:logging",
"//platform/public:types",
"//location/nearby/mediums/proto:web_rtc_signaling_frames_cc_proto",
- "//absl/memory",
- "//absl/strings",
- "//absl/time",
- "//webrtc/api:libjingle_peerconnection_api",
+ "//third_party/absl/memory",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
+ "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
],
)
@@ -70,9 +70,9 @@
"//platform/public:types",
"//net/proto2/public:proto2",
"//testing/base/public:gunit_main",
- "//absl/time",
- "//webrtc/api:libjingle_peerconnection_api",
- "//webrtc/api:rtc_error",
- "//webrtc/api:scoped_refptr",
+ "//third_party/absl/time",
+ "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
+ "//third_party/webrtc/files/stable/webrtc/api:rtc_error",
+ "//third_party/webrtc/files/stable/webrtc/api:scoped_refptr",
],
)
diff --git a/cpp/core/internal/mediums/webrtc/connection_flow.cc b/cpp/core/internal/mediums/webrtc/connection_flow.cc
index d90dace..93e0004 100644
--- a/cpp/core/internal/mediums/webrtc/connection_flow.cc
+++ b/cpp/core/internal/mediums/webrtc/connection_flow.cc
@@ -21,10 +21,11 @@
#include "platform/public/logging.h"
#include "platform/public/mutex_lock.h"
#include "platform/public/webrtc.h"
-#include "absl/memory/memory.h"
-#include "absl/time/time.h"
-#include "webrtc/api/data_channel_interface.h"
-#include "webrtc/api/jsep.h"
+#include "third_party/absl/memory/memory.h"
+#include "third_party/absl/time/civil_time.h"
+#include "third_party/absl/time/time.h"
+#include "third_party/webrtc/files/stable/webrtc/api/data_channel_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/jsep.h"
namespace location {
namespace nearby {
@@ -38,6 +39,7 @@
// This is the same as the nearby data channel name.
const char kDataChannelName[] = "dataChannel";
+
class CreateSessionDescriptionObserverImpl
: public webrtc::CreateSessionDescriptionObserver {
public:
@@ -61,6 +63,9 @@
std::unique_ptr<Future<SessionDescriptionWrapper>> settable_future_;
};
+template <auto value> constexpr auto TConstant = value;
+constexpr auto const MySuperConst = TConstant <100>;
+
class SetSessionDescriptionObserverImpl
: public webrtc::SetSessionDescriptionObserver {
public:
@@ -72,7 +77,36 @@
void OnFailure(webrtc::RTCError error) override {
NEARBY_LOG(ERROR, "Error when setting session description: %s",
error.message());
+ NEARBY_LOG(ERROR, "JFAN: Test copybara replication v2", error.message());
settable_future_->SetException({Exception::kFailed});
+
+ std::cout << MySuperConst;
+
+ const std::string myString = "Hello World";
+
+ auto it = myString.find("Hello");
+ if (it != std::string::npos) std::cout << it << " Hello\n";
+
+ auto it2 = myString.find("World");
+ if (it2 != std::string::npos) std::cout << it2 << " World\n";
+
+ // additional enclosing scope so 'it' doesn't 'leak'
+ {
+ auto it = myString.find("Hello");
+ if (it != std::string::npos) std::cout << "Hello\n";
+ }
+
+ {
+ auto it = myString.find("World");
+ if (it != std::string::npos) std::cout << "World\n";
+ }
+
+ // C++17 with init if:
+ if (const auto it = myString.find("Hello"); it != std::string::npos)
+ std::cout << it << " Hello\n";
+
+ if (const auto it = myString.find("World"); it != std::string::npos)
+ std::cout << it << " World\n";
}
private:
diff --git a/cpp/core/internal/mediums/webrtc/connection_flow.h b/cpp/core/internal/mediums/webrtc/connection_flow.h
index 438a940..d3a96ed 100644
--- a/cpp/core/internal/mediums/webrtc/connection_flow.h
+++ b/cpp/core/internal/mediums/webrtc/connection_flow.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
#include <memory>
@@ -25,8 +25,8 @@
#include "platform/base/runnable.h"
#include "platform/public/single_thread_executor.h"
#include "platform/public/webrtc.h"
-#include "webrtc/api/data_channel_interface.h"
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/data_channel_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
namespace location {
namespace nearby {
@@ -173,4 +173,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
diff --git a/cpp/core/internal/mediums/webrtc/connection_flow_test.cc b/cpp/core/internal/mediums/webrtc/connection_flow_test.cc
index 96c9cca..5a9c67d 100644
--- a/cpp/core/internal/mediums/webrtc/connection_flow_test.cc
+++ b/cpp/core/internal/mediums/webrtc/connection_flow_test.cc
@@ -23,11 +23,11 @@
#include "platform/public/webrtc.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
-#include "webrtc/api/data_channel_interface.h"
-#include "webrtc/api/jsep.h"
-#include "webrtc/api/rtc_error.h"
-#include "webrtc/api/scoped_refptr.h"
+#include "third_party/absl/time/time.h"
+#include "third_party/webrtc/files/stable/webrtc/api/data_channel_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/jsep.h"
+#include "third_party/webrtc/files/stable/webrtc/api/rtc_error.h"
+#include "third_party/webrtc/files/stable/webrtc/api/scoped_refptr.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/webrtc/data_channel_listener.h b/cpp/core/internal/mediums/webrtc/data_channel_listener.h
index ee45875..0f4a346 100644
--- a/cpp/core/internal/mediums/webrtc/data_channel_listener.h
+++ b/cpp/core/internal/mediums/webrtc/data_channel_listener.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
#include "core/listeners.h"
#include "platform/base/byte_array.h"
@@ -48,4 +48,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
diff --git a/cpp/core/internal/mediums/webrtc/data_channel_observer_impl.h b/cpp/core/internal/mediums/webrtc/data_channel_observer_impl.h
index 4de3f34..b7d70c9 100644
--- a/cpp/core/internal/mediums/webrtc/data_channel_observer_impl.h
+++ b/cpp/core/internal/mediums/webrtc/data_channel_observer_impl.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_OBSERVER_IMPL_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_OBSERVER_IMPL_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_OBSERVER_IMPL_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_OBSERVER_IMPL_H_
#include "core/internal/mediums/webrtc/data_channel_listener.h"
-#include "webrtc/api/data_channel_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/data_channel_interface.h"
namespace location {
namespace nearby {
@@ -46,4 +46,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_OBSERVER_IMPL_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_OBSERVER_IMPL_H_
diff --git a/cpp/core/internal/mediums/webrtc/local_ice_candidate_listener.h b/cpp/core/internal/mediums/webrtc/local_ice_candidate_listener.h
index 2408519..d938438 100644
--- a/cpp/core/internal/mediums/webrtc/local_ice_candidate_listener.h
+++ b/cpp/core/internal/mediums/webrtc/local_ice_candidate_listener.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
#include "core/listeners.h"
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
namespace location {
namespace nearby {
@@ -36,4 +36,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
diff --git a/cpp/core/internal/mediums/webrtc/peer_connection_observer_impl.h b/cpp/core/internal/mediums/webrtc/peer_connection_observer_impl.h
index 7bcd86b..85b4cc2 100644
--- a/cpp/core/internal/mediums/webrtc/peer_connection_observer_impl.h
+++ b/cpp/core/internal/mediums/webrtc/peer_connection_observer_impl.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_CONNECTION_OBSERVER_IMPL_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_CONNECTION_OBSERVER_IMPL_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_CONNECTION_OBSERVER_IMPL_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_CONNECTION_OBSERVER_IMPL_H_
#include "core/internal/mediums/webrtc/local_ice_candidate_listener.h"
#include "platform/public/single_thread_executor.h"
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
namespace location {
namespace nearby {
@@ -65,4 +65,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_CONNECTION_OBSERVER_IMPL_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_CONNECTION_OBSERVER_IMPL_H_
diff --git a/cpp/core/internal/mediums/webrtc/peer_id.cc b/cpp/core/internal/mediums/webrtc/peer_id.cc
index 455e2de..57a48ea 100644
--- a/cpp/core/internal/mediums/webrtc/peer_id.cc
+++ b/cpp/core/internal/mediums/webrtc/peer_id.cc
@@ -17,8 +17,8 @@
#include <sstream>
#include "core/internal/mediums/utils.h"
-#include "absl/strings/ascii.h"
-#include "absl/strings/escaping.h"
+#include "third_party/absl/strings/ascii.h"
+#include "third_party/absl/strings/escaping.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/webrtc/peer_id.h b/cpp/core/internal/mediums/webrtc/peer_id.h
index a6df2e9..b593534 100644
--- a/cpp/core/internal/mediums/webrtc/peer_id.h
+++ b/cpp/core/internal/mediums/webrtc/peer_id.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_ID_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_ID_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_ID_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_ID_H_
#include <memory>
#include <string>
@@ -49,4 +49,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_ID_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_PEER_ID_H_
diff --git a/cpp/core/internal/mediums/webrtc/session_description_wrapper.h b/cpp/core/internal/mediums/webrtc/session_description_wrapper.h
index dd59491..1f5e215 100644
--- a/cpp/core/internal/mediums/webrtc/session_description_wrapper.h
+++ b/cpp/core/internal/mediums/webrtc/session_description_wrapper.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
// Wrapper object around SessionDescriptionInterface*.
// This object owns the SessionDescriptionInterface* unless Release() has been
@@ -61,4 +61,4 @@
std::unique_ptr<webrtc::SessionDescriptionInterface> impl_;
};
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
diff --git a/cpp/core/internal/mediums/webrtc/signaling_frames.h b/cpp/core/internal/mediums/webrtc/signaling_frames.h
index 067bb31..d0a750f 100644
--- a/cpp/core/internal/mediums/webrtc/signaling_frames.h
+++ b/cpp/core/internal/mediums/webrtc/signaling_frames.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
#include <vector>
#include "core/internal/mediums/webrtc/peer_id.h"
#include "platform/base/byte_array.h"
#include "location/nearby/mediums/proto/web_rtc_signaling_frames.pb.h"
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
namespace location {
namespace nearby {
@@ -55,4 +55,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
diff --git a/cpp/core/internal/mediums/webrtc/webrtc_socket.h b/cpp/core/internal/mediums/webrtc/webrtc_socket.h
index 37bf048..efea82d 100644
--- a/cpp/core/internal/mediums/webrtc/webrtc_socket.h
+++ b/cpp/core/internal/mediums/webrtc/webrtc_socket.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_H_
#include <memory>
@@ -25,7 +25,7 @@
#include "platform/public/condition_variable.h"
#include "platform/public/mutex.h"
#include "platform/public/pipe.h"
-#include "webrtc/api/data_channel_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/data_channel_interface.h"
namespace location {
namespace nearby {
namespace connections {
@@ -112,4 +112,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_H_
diff --git a/cpp/core/internal/mediums/webrtc/webrtc_socket_test.cc b/cpp/core/internal/mediums/webrtc/webrtc_socket_test.cc
index 72c4e34..938a89b 100644
--- a/cpp/core/internal/mediums/webrtc/webrtc_socket_test.cc
+++ b/cpp/core/internal/mediums/webrtc/webrtc_socket_test.cc
@@ -19,7 +19,7 @@
#include "platform/base/byte_array.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "webrtc/api/data_channel_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/data_channel_interface.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/mediums/webrtc/webrtc_socket_wrapper.h b/cpp/core/internal/mediums/webrtc/webrtc_socket_wrapper.h
index 67c8e2b..a15baf5 100644
--- a/cpp/core/internal/mediums/webrtc/webrtc_socket_wrapper.h
+++ b/cpp/core/internal/mediums/webrtc/webrtc_socket_wrapper.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_WRAPPER_H_
-#define CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_WRAPPER_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_WRAPPER_H_
+#define _CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_WRAPPER_H_
#include <memory>
@@ -60,4 +60,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_WRAPPER_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_WRAPPER_H_
diff --git a/cpp/core/internal/mediums/wifi_lan.h b/cpp/core/internal/mediums/wifi_lan.h
index 53eb4d8..f8fee9e 100644
--- a/cpp/core/internal/mediums/wifi_lan.h
+++ b/cpp/core/internal/mediums/wifi_lan.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MEDIUMS_WIFI_LAN_H_
-#define CORE_INTERNAL_MEDIUMS_WIFI_LAN_H_
+#ifndef _CORE_INTERNAL_MEDIUMS_WIFI_LAN_H_
+#define _CORE_INTERNAL_MEDIUMS_WIFI_LAN_H_
#include <cstdint>
#include <string>
@@ -23,8 +23,8 @@
#include "platform/public/multi_thread_executor.h"
#include "platform/public/mutex.h"
#include "platform/public/wifi_lan.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
namespace location {
namespace nearby {
@@ -161,4 +161,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MEDIUMS_WIFI_LAN_H_
+#endif // _CORE_INTERNAL_MEDIUMS_WIFI_LAN_H_
diff --git a/cpp/core/internal/mediums/wifi_lan_test.cc b/cpp/core/internal/mediums/wifi_lan_test.cc
index 7b88ef6..0af1554 100644
--- a/cpp/core/internal/mediums/wifi_lan_test.cc
+++ b/cpp/core/internal/mediums/wifi_lan_test.cc
@@ -22,7 +22,7 @@
#include "platform/public/wifi_lan.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/message_lite.h b/cpp/core/internal/message_lite.h
index 5ce9d91..9d0972c 100644
--- a/cpp/core/internal/message_lite.h
+++ b/cpp/core/internal/message_lite.h
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MESSAGE_LITE_H_
-#define CORE_INTERNAL_MESSAGE_LITE_H_
+#ifndef _CORE_INTERNAL_MESSAGE_LITE_H_
+#define _CORE_INTERNAL_MESSAGE_LITE_H_
#include "google/protobuf/message_lite.h"
-#endif // CORE_INTERNAL_MESSAGE_LITE_H_
+#endif // _CORE_INTERNAL_MESSAGE_LITE_H_
diff --git a/cpp/core/internal/mock_service_controller.h b/cpp/core/internal/mock_service_controller.h
index 9f2c0e2..0f78742 100644
--- a/cpp/core/internal/mock_service_controller.h
+++ b/cpp/core/internal/mock_service_controller.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_H_
-#define CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_H_
+#ifndef _CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_H_
+#define _CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_H_
#include "core/internal/service_controller.h"
#include "gmock/gmock.h"
@@ -89,4 +89,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_H_
+#endif // _CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_H_
diff --git a/cpp/core/internal/offline_frames.h b/cpp/core/internal/offline_frames.h
index b8694d7..4a49b08 100644
--- a/cpp/core/internal/offline_frames.h
+++ b/cpp/core/internal/offline_frames.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_OFFLINE_FRAMES_H_
-#define CORE_INTERNAL_OFFLINE_FRAMES_H_
+#ifndef _CORE_INTERNAL_OFFLINE_FRAMES_H_
+#define _CORE_INTERNAL_OFFLINE_FRAMES_H_
#include <cstdint>
#include <vector>
@@ -101,4 +101,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_OFFLINE_FRAMES_H_
+#endif // _CORE_INTERNAL_OFFLINE_FRAMES_H_
diff --git a/cpp/core/internal/offline_frames_validator.h b/cpp/core/internal/offline_frames_validator.h
index a673c91..a579e15 100644
--- a/cpp/core/internal/offline_frames_validator.h
+++ b/cpp/core/internal/offline_frames_validator.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
-#define CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
+#ifndef _CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
+#define _CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
#include "proto/connections/offline_wire_formats.pb.h"
#include "platform/base/exception.h"
@@ -30,4 +30,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
+#endif // _CORE_INTERNAL_OFFLINE_FRAMES_VALIDATOR_H_
diff --git a/cpp/core/internal/offline_service_controller.h b/cpp/core/internal/offline_service_controller.h
index 9e1d0e8..75fea2f 100644
--- a/cpp/core/internal/offline_service_controller.h
+++ b/cpp/core/internal/offline_service_controller.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_
-#define CORE_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_
+#ifndef _CORE_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_
+#define _CORE_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_
#include <cstdint>
#include <string>
@@ -97,4 +97,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_
+#endif // _CORE_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_
diff --git a/cpp/core/internal/offline_simulation_user.cc b/cpp/core/internal/offline_simulation_user.cc
index e327125..c283efd 100644
--- a/cpp/core/internal/offline_simulation_user.cc
+++ b/cpp/core/internal/offline_simulation_user.cc
@@ -18,7 +18,7 @@
#include "platform/base/byte_array.h"
#include "platform/public/count_down_latch.h"
#include "platform/public/system_clock.h"
-#include "absl/functional/bind_front.h"
+#include "third_party/absl/functional/bind_front.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/offline_simulation_user.h b/cpp/core/internal/offline_simulation_user.h
index d4299d0..b264fe6 100644
--- a/cpp/core/internal/offline_simulation_user.h
+++ b/cpp/core/internal/offline_simulation_user.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_OFFLINE_SIMULATION_USER_H_
-#define CORE_INTERNAL_OFFLINE_SIMULATION_USER_H_
+#ifndef _CORE_INTERNAL_OFFLINE_SIMULATION_USER_H_
+#define _CORE_INTERNAL_OFFLINE_SIMULATION_USER_H_
#include <string>
@@ -25,7 +25,7 @@
#include "platform/public/count_down_latch.h"
#include "platform/public/future.h"
#include "gtest/gtest.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
// Test-only class to help run end-to-end simulations for nearby connections
// protocol.
@@ -191,4 +191,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_OFFLINE_SIMULATION_USER_H_
+#endif // _CORE_INTERNAL_OFFLINE_SIMULATION_USER_H_
diff --git a/cpp/core/internal/p2p_cluster_pcp_handler.cc b/cpp/core/internal/p2p_cluster_pcp_handler.cc
index f8cef07..b0ee700 100644
--- a/cpp/core/internal/p2p_cluster_pcp_handler.cc
+++ b/cpp/core/internal/p2p_cluster_pcp_handler.cc
@@ -27,8 +27,8 @@
#include "platform/base/types.h"
#include "platform/public/crypto.h"
#include "proto/connections_enums.pb.h"
-#include "absl/functional/bind_front.h"
-#include "absl/strings/escaping.h"
+#include "third_party/absl/functional/bind_front.h"
+#include "third_party/absl/strings/escaping.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/p2p_cluster_pcp_handler.h b/cpp/core/internal/p2p_cluster_pcp_handler.h
index 43b84f3..e236419 100644
--- a/cpp/core/internal/p2p_cluster_pcp_handler.h
+++ b/cpp/core/internal/p2p_cluster_pcp_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_P2P_CLUSTER_PCP_HANDLER_H_
-#define CORE_INTERNAL_P2P_CLUSTER_PCP_HANDLER_H_
+#ifndef _CORE_INTERNAL_P2P_CLUSTER_PCP_HANDLER_H_
+#define _CORE_INTERNAL_P2P_CLUSTER_PCP_HANDLER_H_
#include <memory>
#include <vector>
@@ -211,4 +211,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_P2P_CLUSTER_PCP_HANDLER_H_
+#endif // _CORE_INTERNAL_P2P_CLUSTER_PCP_HANDLER_H_
diff --git a/cpp/core/internal/p2p_cluster_pcp_handler_test.cc b/cpp/core/internal/p2p_cluster_pcp_handler_test.cc
index ec82464..7726614 100644
--- a/cpp/core/internal/p2p_cluster_pcp_handler_test.cc
+++ b/cpp/core/internal/p2p_cluster_pcp_handler_test.cc
@@ -24,7 +24,7 @@
#include "platform/public/logging.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/p2p_point_to_point_pcp_handler.h b/cpp/core/internal/p2p_point_to_point_pcp_handler.h
index fa6ac46..55e173e 100644
--- a/cpp/core/internal/p2p_point_to_point_pcp_handler.h
+++ b/cpp/core/internal/p2p_point_to_point_pcp_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_P2P_POINT_TO_POINT_PCP_HANDLER_H_
-#define CORE_INTERNAL_P2P_POINT_TO_POINT_PCP_HANDLER_H_
+#ifndef _CORE_INTERNAL_P2P_POINT_TO_POINT_PCP_HANDLER_H_
+#define _CORE_INTERNAL_P2P_POINT_TO_POINT_PCP_HANDLER_H_
#include "core/internal/endpoint_channel_manager.h"
#include "core/internal/endpoint_manager.h"
@@ -52,4 +52,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_P2P_POINT_TO_POINT_PCP_HANDLER_H_
+#endif // _CORE_INTERNAL_P2P_POINT_TO_POINT_PCP_HANDLER_H_
diff --git a/cpp/core/internal/p2p_star_pcp_handler.h b/cpp/core/internal/p2p_star_pcp_handler.h
index cc01c71..7ddbf4b 100644
--- a/cpp/core/internal/p2p_star_pcp_handler.h
+++ b/cpp/core/internal/p2p_star_pcp_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_P2P_STAR_PCP_HANDLER_H_
-#define CORE_INTERNAL_P2P_STAR_PCP_HANDLER_H_
+#ifndef _CORE_INTERNAL_P2P_STAR_PCP_HANDLER_H_
+#define _CORE_INTERNAL_P2P_STAR_PCP_HANDLER_H_
#include <vector>
@@ -56,4 +56,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_P2P_STAR_PCP_HANDLER_H_
+#endif // _CORE_INTERNAL_P2P_STAR_PCP_HANDLER_H_
diff --git a/cpp/core/internal/payload_manager.cc b/cpp/core/internal/payload_manager.cc
index d9a0ba6..cc2e3e4 100644
--- a/cpp/core/internal/payload_manager.cc
+++ b/cpp/core/internal/payload_manager.cc
@@ -26,9 +26,9 @@
#include "platform/public/mutex_lock.h"
#include "platform/public/single_thread_executor.h"
#include "platform/public/system_clock.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "absl/time/time.h"
+#include "third_party/absl/memory/memory.h"
+#include "third_party/absl/strings/str_cat.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/payload_manager.h b/cpp/core/internal/payload_manager.h
index 9c18756..a0a324e 100644
--- a/cpp/core/internal/payload_manager.h
+++ b/cpp/core/internal/payload_manager.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_PAYLOAD_MANAGER_H_
-#define CORE_INTERNAL_PAYLOAD_MANAGER_H_
+#ifndef _CORE_INTERNAL_PAYLOAD_MANAGER_H_
+#define _CORE_INTERNAL_PAYLOAD_MANAGER_H_
#include <cstdint>
#include <memory>
@@ -33,7 +33,7 @@
#include "platform/public/count_down_latch.h"
#include "platform/public/mutex.h"
#include "proto/connections_enums.pb.h"
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -302,4 +302,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_PAYLOAD_MANAGER_H_
+#endif // _CORE_INTERNAL_PAYLOAD_MANAGER_H_
diff --git a/cpp/core/internal/payload_manager_test.cc b/cpp/core/internal/payload_manager_test.cc
index 6ca1719..bf6d33d 100644
--- a/cpp/core/internal/payload_manager_test.cc
+++ b/cpp/core/internal/payload_manager_test.cc
@@ -20,7 +20,7 @@
#include "platform/public/system_clock.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/pcp.h b/cpp/core/internal/pcp.h
index 657db61..44f70a1 100644
--- a/cpp/core/internal/pcp.h
+++ b/cpp/core/internal/pcp.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_PCP_H_
-#define CORE_INTERNAL_PCP_H_
+#ifndef _CORE_INTERNAL_PCP_H_
+#define _CORE_INTERNAL_PCP_H_
namespace location {
namespace nearby {
@@ -37,4 +37,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_PCP_H_
+#endif // _CORE_INTERNAL_PCP_H_
diff --git a/cpp/core/internal/pcp_handler.h b/cpp/core/internal/pcp_handler.h
index eaf8aab..4169ddb 100644
--- a/cpp/core/internal/pcp_handler.h
+++ b/cpp/core/internal/pcp_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_PCP_HANDLER_H_
-#define CORE_INTERNAL_PCP_HANDLER_H_
+#ifndef _CORE_INTERNAL_PCP_HANDLER_H_
+#define _CORE_INTERNAL_PCP_HANDLER_H_
#include <vector>
@@ -67,7 +67,7 @@
// start advertising, we'll change the ClientProxy's state.
// ConnectionListener (info.listener) will be notified in case of any event.
// See
- // cpp/core/listeners.h
+ // cpp/core/listeners.h;bpv=1;bpt=1;l=71?gsn=ConnectionListener
virtual Status StartAdvertising(ClientProxy* client,
const std::string& service_id,
const ConnectionOptions& options,
@@ -120,4 +120,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_PCP_HANDLER_H_
+#endif // _CORE_INTERNAL_PCP_HANDLER_H_
diff --git a/cpp/core/internal/pcp_manager.h b/cpp/core/internal/pcp_manager.h
index 16708d6..adea685 100644
--- a/cpp/core/internal/pcp_manager.h
+++ b/cpp/core/internal/pcp_manager.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_PCP_MANAGER_H_
-#define CORE_INTERNAL_PCP_MANAGER_H_
+#ifndef _CORE_INTERNAL_PCP_MANAGER_H_
+#define _CORE_INTERNAL_PCP_MANAGER_H_
#include <string>
@@ -29,7 +29,7 @@
#include "core/status.h"
#include "core/strategy.h"
#include "platform/public/atomic_boolean.h"
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -86,4 +86,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_PCP_MANAGER_H_
+#endif // _CORE_INTERNAL_PCP_MANAGER_H_
diff --git a/cpp/core/internal/pcp_manager_test.cc b/cpp/core/internal/pcp_manager_test.cc
index 3d628ab..29f1e45 100644
--- a/cpp/core/internal/pcp_manager_test.cc
+++ b/cpp/core/internal/pcp_manager_test.cc
@@ -24,7 +24,7 @@
#include "platform/public/count_down_latch.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/service_controller.h b/cpp/core/internal/service_controller.h
index 1fa3f64..5b38c88 100644
--- a/cpp/core/internal/service_controller.h
+++ b/cpp/core/internal/service_controller.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_SERVICE_CONTROLLER_H_
-#define CORE_INTERNAL_SERVICE_CONTROLLER_H_
+#ifndef _CORE_INTERNAL_SERVICE_CONTROLLER_H_
+#define _CORE_INTERNAL_SERVICE_CONTROLLER_H_
#include <cstdint>
#include <string>
@@ -99,4 +99,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_SERVICE_CONTROLLER_H_
+#endif // _CORE_INTERNAL_SERVICE_CONTROLLER_H_
diff --git a/cpp/core/internal/service_controller_router.cc b/cpp/core/internal/service_controller_router.cc
index 0e1932a..8c89b3b 100644
--- a/cpp/core/internal/service_controller_router.cc
+++ b/cpp/core/internal/service_controller_router.cc
@@ -26,8 +26,8 @@
#include "core/payload.h"
#include "platform/base/feature_flags.h"
#include "platform/public/logging.h"
-#include "absl/memory/memory.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/memory/memory.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/service_controller_router.h b/cpp/core/internal/service_controller_router.h
index a98b284..6a15e51 100644
--- a/cpp/core/internal/service_controller_router.h
+++ b/cpp/core/internal/service_controller_router.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_SERVICE_CONTROLLER_ROUTER_H_
-#define CORE_INTERNAL_SERVICE_CONTROLLER_ROUTER_H_
+#ifndef _CORE_INTERNAL_SERVICE_CONTROLLER_ROUTER_H_
+#define _CORE_INTERNAL_SERVICE_CONTROLLER_ROUTER_H_
#include <memory>
#include <string>
@@ -25,9 +25,9 @@
#include "core/params.h"
#include "platform/base/runnable.h"
#include "platform/public/single_thread_executor.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/strings/string_view.h"
-#include "absl/types/span.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/strings/string_view.h"
+#include "third_party/absl/types/span.h"
namespace location {
namespace nearby {
@@ -127,4 +127,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_SERVICE_CONTROLLER_ROUTER_H_
+#endif // _CORE_INTERNAL_SERVICE_CONTROLLER_ROUTER_H_
diff --git a/cpp/core/internal/service_controller_router_test.cc b/cpp/core/internal/service_controller_router_test.cc
index beb2c2e..6ad6c23 100644
--- a/cpp/core/internal/service_controller_router_test.cc
+++ b/cpp/core/internal/service_controller_router_test.cc
@@ -31,9 +31,9 @@
#include "platform/public/mutex_lock.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/time/clock.h"
-#include "absl/types/span.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/types/span.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/simulation_user.cc b/cpp/core/internal/simulation_user.cc
index 5c57a3d..e0eb588 100644
--- a/cpp/core/internal/simulation_user.cc
+++ b/cpp/core/internal/simulation_user.cc
@@ -17,7 +17,7 @@
#include "core/listeners.h"
#include "platform/public/count_down_latch.h"
#include "platform/public/system_clock.h"
-#include "absl/functional/bind_front.h"
+#include "third_party/absl/functional/bind_front.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/simulation_user.h b/cpp/core/internal/simulation_user.h
index 14152bf..7130c7e 100644
--- a/cpp/core/internal/simulation_user.h
+++ b/cpp/core/internal/simulation_user.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_SIMULATION_USER_H_
-#define CORE_INTERNAL_SIMULATION_USER_H_
+#ifndef _CORE_INTERNAL_SIMULATION_USER_H_
+#define _CORE_INTERNAL_SIMULATION_USER_H_
#include <string>
@@ -161,4 +161,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_SIMULATION_USER_H_
+#endif // _CORE_INTERNAL_SIMULATION_USER_H_
diff --git a/cpp/core/internal/webrtc_bwu_handler.cc b/cpp/core/internal/webrtc_bwu_handler.cc
index d4ca9e3..ea44eb3 100644
--- a/cpp/core/internal/webrtc_bwu_handler.cc
+++ b/cpp/core/internal/webrtc_bwu_handler.cc
@@ -21,7 +21,7 @@
#include "core/internal/mediums/webrtc/peer_id.h"
#include "core/internal/offline_frames.h"
#include "core/internal/webrtc_endpoint_channel.h"
-#include "absl/functional/bind_front.h"
+#include "third_party/absl/functional/bind_front.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/webrtc_bwu_handler.h b/cpp/core/internal/webrtc_bwu_handler.h
index 169c4d9..709c10b 100644
--- a/cpp/core/internal/webrtc_bwu_handler.h
+++ b/cpp/core/internal/webrtc_bwu_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_WEBRTC_BWU_HANDLER_H_
-#define CORE_INTERNAL_WEBRTC_BWU_HANDLER_H_
+#ifndef _CORE_INTERNAL_WEBRTC_BWU_HANDLER_H_
+#define _CORE_INTERNAL_WEBRTC_BWU_HANDLER_H_
#include "core/internal/base_bwu_handler.h"
#include "core/internal/client_proxy.h"
@@ -92,4 +92,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_WEBRTC_BWU_HANDLER_H_
+#endif // _CORE_INTERNAL_WEBRTC_BWU_HANDLER_H_
diff --git a/cpp/core/internal/webrtc_endpoint_channel.h b/cpp/core/internal/webrtc_endpoint_channel.h
index e15cc0c..7005a0e 100644
--- a/cpp/core/internal/webrtc_endpoint_channel.h
+++ b/cpp/core/internal/webrtc_endpoint_channel.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_WEBRTC_ENDPOINT_CHANNEL_H_
-#define CORE_INTERNAL_WEBRTC_ENDPOINT_CHANNEL_H_
+#ifndef _CORE_INTERNAL_WEBRTC_ENDPOINT_CHANNEL_H_
+#define _CORE_INTERNAL_WEBRTC_ENDPOINT_CHANNEL_H_
#include "core/internal/base_endpoint_channel.h"
#include "core/internal/mediums/webrtc/webrtc_socket_wrapper.h"
@@ -40,4 +40,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_WEBRTC_ENDPOINT_CHANNEL_H_
+#endif // _CORE_INTERNAL_WEBRTC_ENDPOINT_CHANNEL_H_
diff --git a/cpp/core/internal/wifi_lan_bwu_handler.cc b/cpp/core/internal/wifi_lan_bwu_handler.cc
index 4397636..0dbe764 100644
--- a/cpp/core/internal/wifi_lan_bwu_handler.cc
+++ b/cpp/core/internal/wifi_lan_bwu_handler.cc
@@ -22,7 +22,7 @@
#include "core/internal/offline_frames.h"
#include "core/internal/wifi_lan_endpoint_channel.h"
#include "platform/public/wifi_lan.h"
-#include "absl/functional/bind_front.h"
+#include "third_party/absl/functional/bind_front.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/wifi_lan_bwu_handler.h b/cpp/core/internal/wifi_lan_bwu_handler.h
index 17f7146..282a687 100644
--- a/cpp/core/internal/wifi_lan_bwu_handler.h
+++ b/cpp/core/internal/wifi_lan_bwu_handler.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_WIFI_LAN_BWU_HANDLER_H_
-#define CORE_INTERNAL_WIFI_LAN_BWU_HANDLER_H_
+#ifndef _CORE_INTERNAL_WIFI_LAN_BWU_HANDLER_H_
+#define _CORE_INTERNAL_WIFI_LAN_BWU_HANDLER_H_
#include "core/internal/base_bwu_handler.h"
#include "core/internal/client_proxy.h"
@@ -76,4 +76,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_WIFI_LAN_BWU_HANDLER_H_
+#endif // _CORE_INTERNAL_WIFI_LAN_BWU_HANDLER_H_
diff --git a/cpp/core/internal/wifi_lan_endpoint_channel.h b/cpp/core/internal/wifi_lan_endpoint_channel.h
index 87eb359..e26d10e 100644
--- a/cpp/core/internal/wifi_lan_endpoint_channel.h
+++ b/cpp/core/internal/wifi_lan_endpoint_channel.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_WIFI_LAN_ENDPOINT_CHANNEL_H_
-#define CORE_INTERNAL_WIFI_LAN_ENDPOINT_CHANNEL_H_
+#ifndef _CORE_INTERNAL_WIFI_LAN_ENDPOINT_CHANNEL_H_
+#define _CORE_INTERNAL_WIFI_LAN_ENDPOINT_CHANNEL_H_
#include "core/internal/base_endpoint_channel.h"
#include "platform/public/wifi_lan.h"
@@ -41,4 +41,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_WIFI_LAN_ENDPOINT_CHANNEL_H_
+#endif // _CORE_INTERNAL_WIFI_LAN_ENDPOINT_CHANNEL_H_
diff --git a/cpp/core/internal/wifi_lan_service_info.cc b/cpp/core/internal/wifi_lan_service_info.cc
index bb07b1d..95cdec3 100644
--- a/cpp/core/internal/wifi_lan_service_info.cc
+++ b/cpp/core/internal/wifi_lan_service_info.cc
@@ -22,7 +22,7 @@
#include "platform/base/base64_utils.h"
#include "platform/base/base_input_stream.h"
#include "platform/public/logging.h"
-#include "absl/strings/str_cat.h"
+#include "third_party/absl/strings/str_cat.h"
namespace location {
namespace nearby {
diff --git a/cpp/core/internal/wifi_lan_service_info.h b/cpp/core/internal/wifi_lan_service_info.h
index 2755783..01ca5fb 100644
--- a/cpp/core/internal/wifi_lan_service_info.h
+++ b/cpp/core/internal/wifi_lan_service_info.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_INTERNAL_WIFI_LAN_SERVICE_INFO_H_
-#define CORE_INTERNAL_WIFI_LAN_SERVICE_INFO_H_
+#ifndef _CORE_INTERNAL_WIFI_LAN_SERVICE_INFO_H_
+#define _CORE_INTERNAL_WIFI_LAN_SERVICE_INFO_H_
#include <cstdint>
@@ -21,7 +21,7 @@
#include "core/internal/pcp.h"
#include "platform/base/byte_array.h"
#include "platform/base/nsd_service_info.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -95,4 +95,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_INTERNAL_WIFI_LAN_SERVICE_INFO_H_
+#endif // _CORE_INTERNAL_WIFI_LAN_SERVICE_INFO_H_
diff --git a/cpp/core/listeners.h b/cpp/core/listeners.h
index 9ef5d2d..36fe788 100644
--- a/cpp/core/listeners.h
+++ b/cpp/core/listeners.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_LISTENERS_H_
-#define CORE_LISTENERS_H_
+#ifndef _CORE_LISTENERS_H_
+#define _CORE_LISTENERS_H_
#include <cstdint>
#include <functional>
@@ -194,4 +194,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_LISTENERS_H_
+#endif // _CORE_LISTENERS_H_
diff --git a/cpp/core/options.h b/cpp/core/options.h
index 100e80e..725f879 100644
--- a/cpp/core/options.h
+++ b/cpp/core/options.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_OPTIONS_H_
-#define CORE_OPTIONS_H_
+#ifndef _CORE_OPTIONS_H_
+#define _CORE_OPTIONS_H_
#include "core/strategy.h"
#include "platform/base/byte_array.h"
@@ -163,4 +163,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_OPTIONS_H_
+#endif // _CORE_OPTIONS_H_
diff --git a/cpp/core/params.h b/cpp/core/params.h
index c34fc13..c9fcc41 100644
--- a/cpp/core/params.h
+++ b/cpp/core/params.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_PARAMS_H_
-#define CORE_PARAMS_H_
+#ifndef _CORE_PARAMS_H_
+#define _CORE_PARAMS_H_
#include <string>
@@ -39,4 +39,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_PARAMS_H_
+#endif // _CORE_PARAMS_H_
diff --git a/cpp/core/payload.h b/cpp/core/payload.h
index 2718ea5..9590d15 100644
--- a/cpp/core/payload.h
+++ b/cpp/core/payload.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_PAYLOAD_H_
-#define CORE_PAYLOAD_H_
+#ifndef _CORE_PAYLOAD_H_
+#define _CORE_PAYLOAD_H_
#include <cstdint>
#include <functional>
@@ -25,7 +25,7 @@
#include "platform/base/payload_id.h"
#include "platform/base/prng.h"
#include "platform/public/file.h"
-#include "absl/types/variant.h"
+#include "third_party/absl/types/variant.h"
namespace location {
namespace nearby {
@@ -106,4 +106,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_PAYLOAD_H_
+#endif // _CORE_PAYLOAD_H_
diff --git a/cpp/core/status.h b/cpp/core/status.h
index ae72d13..1561b8b 100644
--- a/cpp/core/status.h
+++ b/cpp/core/status.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_STATUS_H_
-#define CORE_STATUS_H_
+#ifndef _CORE_STATUS_H_
+#define _CORE_STATUS_H_
namespace location {
namespace nearby {
@@ -58,4 +58,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_STATUS_H_
+#endif // _CORE_STATUS_H_
diff --git a/cpp/core/strategy.h b/cpp/core/strategy.h
index 09b25d6..9384a0a 100644
--- a/cpp/core/strategy.h
+++ b/cpp/core/strategy.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef CORE_STRATEGY_H_
-#define CORE_STRATEGY_H_
+#ifndef _CORE_STRATEGY_H_
+#define _CORE_STRATEGY_H_
#include <string>
@@ -73,4 +73,4 @@
} // namespace nearby
} // namespace location
-#endif // CORE_STRATEGY_H_
+#endif // _CORE_STRATEGY_H_
diff --git a/cpp/platform/api/BUILD b/cpp/platform/api/BUILD
index cad9831..6b1fe62 100644
--- a/cpp/platform/api/BUILD
+++ b/cpp/platform/api/BUILD
@@ -41,9 +41,9 @@
],
deps = [
"//platform/base",
- "//absl/base:core_headers",
- "//absl/strings",
- "//absl/time",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
],
)
@@ -69,9 +69,9 @@
"//proto/connections:offline_wire_formats_portable_proto",
"//platform/base",
"//platform/base:cancellation_flag",
- "//absl/strings",
- "//absl/types:optional",
- "//webrtc/api:libjingle_peerconnection_api",
+ "//third_party/absl/strings",
+ "//third_party/absl/types:optional",
+ "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
],
)
@@ -90,6 +90,6 @@
":comm",
":types",
"//platform/base",
- "//absl/strings",
+ "//third_party/absl/strings",
],
)
diff --git a/cpp/platform/api/atomic_boolean.h b/cpp/platform/api/atomic_boolean.h
index e001792..ee3d03d 100644
--- a/cpp/platform/api/atomic_boolean.h
+++ b/cpp/platform/api/atomic_boolean.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_ATOMIC_BOOLEAN_H_
-#define PLATFORM_API_ATOMIC_BOOLEAN_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_ATOMIC_BOOLEAN_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_ATOMIC_BOOLEAN_H_
namespace location {
namespace nearby {
@@ -35,4 +35,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_ATOMIC_BOOLEAN_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_ATOMIC_BOOLEAN_H_
diff --git a/cpp/platform/api/atomic_reference.h b/cpp/platform/api/atomic_reference.h
index a6f4c93..31393cb 100644
--- a/cpp/platform/api/atomic_reference.h
+++ b/cpp/platform/api/atomic_reference.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_ATOMIC_REFERENCE_H_
-#define PLATFORM_API_ATOMIC_REFERENCE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_ATOMIC_REFERENCE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_ATOMIC_REFERENCE_H_
#include <cstdint>
@@ -37,4 +37,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_ATOMIC_REFERENCE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_ATOMIC_REFERENCE_H_
diff --git a/cpp/platform/api/ble.h b/cpp/platform/api/ble.h
index c58df6d..9dab253 100644
--- a/cpp/platform/api/ble.h
+++ b/cpp/platform/api/ble.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_BLE_H_
-#define PLATFORM_API_BLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_BLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_BLE_H_
#include "platform/api/bluetooth_classic.h"
#include "platform/base/byte_array.h"
@@ -122,4 +122,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_BLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_BLE_H_
diff --git a/cpp/platform/api/ble_v2.h b/cpp/platform/api/ble_v2.h
index a82ca32..88b0b37 100644
--- a/cpp/platform/api/ble_v2.h
+++ b/cpp/platform/api/ble_v2.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_BLE_V2_H_
-#define PLATFORM_API_BLE_V2_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_BLE_V2_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_BLE_V2_H_
#include <cstdint>
#include <limits>
@@ -24,8 +24,8 @@
#include "platform/base/byte_array.h"
#include "platform/base/exception.h"
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
+#include "third_party/absl/strings/string_view.h"
+#include "third_party/absl/types/optional.h"
namespace location {
namespace nearby {
@@ -403,4 +403,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_BLE_V2_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_BLE_V2_H_
diff --git a/cpp/platform/api/bluetooth_adapter.h b/cpp/platform/api/bluetooth_adapter.h
index 4ca4022..364343c 100644
--- a/cpp/platform/api/bluetooth_adapter.h
+++ b/cpp/platform/api/bluetooth_adapter.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_BLUETOOTH_ADAPTER_H_
-#define PLATFORM_API_BLUETOOTH_ADAPTER_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_BLUETOOTH_ADAPTER_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_BLUETOOTH_ADAPTER_H_
#include <string>
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -72,4 +72,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_BLUETOOTH_ADAPTER_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_BLUETOOTH_ADAPTER_H_
diff --git a/cpp/platform/api/bluetooth_classic.h b/cpp/platform/api/bluetooth_classic.h
index 9536186..a117397 100644
--- a/cpp/platform/api/bluetooth_classic.h
+++ b/cpp/platform/api/bluetooth_classic.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_BLUETOOTH_CLASSIC_H_
-#define PLATFORM_API_BLUETOOTH_CLASSIC_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_BLUETOOTH_CLASSIC_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_BLUETOOTH_CLASSIC_H_
#include <memory>
#include <string>
@@ -159,4 +159,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_BLUETOOTH_CLASSIC_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_BLUETOOTH_CLASSIC_H_
diff --git a/cpp/platform/api/cancelable.h b/cpp/platform/api/cancelable.h
index c90faf0..1a29f43 100644
--- a/cpp/platform/api/cancelable.h
+++ b/cpp/platform/api/cancelable.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_CANCELABLE_H_
-#define PLATFORM_API_CANCELABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_CANCELABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_CANCELABLE_H_
namespace location {
namespace nearby {
@@ -32,4 +32,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_CANCELABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_CANCELABLE_H_
diff --git a/cpp/platform/api/condition_variable.h b/cpp/platform/api/condition_variable.h
index 2bac6a8..e2623ec 100644
--- a/cpp/platform/api/condition_variable.h
+++ b/cpp/platform/api/condition_variable.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_CONDITION_VARIABLE_H_
-#define PLATFORM_API_CONDITION_VARIABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_CONDITION_VARIABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_CONDITION_VARIABLE_H_
#include "platform/base/exception.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -48,4 +48,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_CONDITION_VARIABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_CONDITION_VARIABLE_H_
diff --git a/cpp/platform/api/count_down_latch.h b/cpp/platform/api/count_down_latch.h
index 5ae9576..258eb3d 100644
--- a/cpp/platform/api/count_down_latch.h
+++ b/cpp/platform/api/count_down_latch.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_COUNT_DOWN_LATCH_H_
-#define PLATFORM_API_COUNT_DOWN_LATCH_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_COUNT_DOWN_LATCH_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_COUNT_DOWN_LATCH_H_
#include <cstdint>
#include "platform/base/exception.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
@@ -42,4 +42,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_COUNT_DOWN_LATCH_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_COUNT_DOWN_LATCH_H_
diff --git a/cpp/platform/api/crypto.h b/cpp/platform/api/crypto.h
index 241a7a4..5c9bd87 100644
--- a/cpp/platform/api/crypto.h
+++ b/cpp/platform/api/crypto.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_CRYPTO_H_
-#define PLATFORM_API_CRYPTO_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_CRYPTO_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_CRYPTO_H_
#include "platform/base/byte_array.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -35,4 +35,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_CRYPTO_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_CRYPTO_H_
diff --git a/cpp/platform/api/executor.h b/cpp/platform/api/executor.h
index ee5f5dc..1bc2133 100644
--- a/cpp/platform/api/executor.h
+++ b/cpp/platform/api/executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_EXECUTOR_H_
-#define PLATFORM_API_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_EXECUTOR_H_
#include "platform/base/runnable.h"
@@ -43,4 +43,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_EXECUTOR_H_
diff --git a/cpp/platform/api/future.h b/cpp/platform/api/future.h
index 5549a8b..5952536 100644
--- a/cpp/platform/api/future.h
+++ b/cpp/platform/api/future.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_FUTURE_H_
-#define PLATFORM_API_FUTURE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_FUTURE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_FUTURE_H_
#include "platform/base/exception.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -43,4 +43,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_FUTURE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_FUTURE_H_
diff --git a/cpp/platform/api/input_file.h b/cpp/platform/api/input_file.h
index f566e80..53d1665 100644
--- a/cpp/platform/api/input_file.h
+++ b/cpp/platform/api/input_file.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_INPUT_FILE_H_
-#define PLATFORM_API_INPUT_FILE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_INPUT_FILE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_INPUT_FILE_H_
#include <cstdint>
@@ -37,4 +37,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_INPUT_FILE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_INPUT_FILE_H_
diff --git a/cpp/platform/api/listenable_future.h b/cpp/platform/api/listenable_future.h
index 7bf7f17..09fda19 100644
--- a/cpp/platform/api/listenable_future.h
+++ b/cpp/platform/api/listenable_future.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_LISTENABLE_FUTURE_H_
-#define PLATFORM_API_LISTENABLE_FUTURE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_LISTENABLE_FUTURE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_LISTENABLE_FUTURE_H_
#include <functional>
#include <memory>
@@ -43,4 +43,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_LISTENABLE_FUTURE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_LISTENABLE_FUTURE_H_
diff --git a/cpp/platform/api/log_message.h b/cpp/platform/api/log_message.h
index 3f43c0b..965a24f 100644
--- a/cpp/platform/api/log_message.h
+++ b/cpp/platform/api/log_message.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_LOG_MESSAGE_H_
-#define PLATFORM_API_LOG_MESSAGE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_LOG_MESSAGE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_LOG_MESSAGE_H_
#include <iostream>
@@ -56,4 +56,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_LOG_MESSAGE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_LOG_MESSAGE_H_
diff --git a/cpp/platform/api/mutex.h b/cpp/platform/api/mutex.h
index 75824d2..b83b59b 100644
--- a/cpp/platform/api/mutex.h
+++ b/cpp/platform/api/mutex.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_MUTEX_H_
-#define PLATFORM_API_MUTEX_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_MUTEX_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_MUTEX_H_
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -52,4 +52,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_MUTEX_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_MUTEX_H_
diff --git a/cpp/platform/api/output_file.h b/cpp/platform/api/output_file.h
index a6176e5..aeeed53 100644
--- a/cpp/platform/api/output_file.h
+++ b/cpp/platform/api/output_file.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_OUTPUT_FILE_H_
-#define PLATFORM_API_OUTPUT_FILE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_OUTPUT_FILE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_OUTPUT_FILE_H_
#include "platform/base/byte_array.h"
#include "platform/base/exception.h"
@@ -33,4 +33,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_OUTPUT_FILE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_OUTPUT_FILE_H_
diff --git a/cpp/platform/api/platform.h b/cpp/platform/api/platform.h
index 266e9ba..9b37e34 100644
--- a/cpp/platform/api/platform.h
+++ b/cpp/platform/api/platform.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_PLATFORM_H_
-#define PLATFORM_API_PLATFORM_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_PLATFORM_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_PLATFORM_H_
#include <cstdint>
#include <memory>
@@ -41,7 +41,7 @@
#include "platform/api/wifi.h"
#include "platform/api/wifi_lan.h"
#include "platform/base/payload_id.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -108,4 +108,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_PLATFORM_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_PLATFORM_H_
diff --git a/cpp/platform/api/scheduled_executor.h b/cpp/platform/api/scheduled_executor.h
index 7342b58..6b5ab2b 100644
--- a/cpp/platform/api/scheduled_executor.h
+++ b/cpp/platform/api/scheduled_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_SCHEDULED_EXECUTOR_H_
-#define PLATFORM_API_SCHEDULED_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_SCHEDULED_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_SCHEDULED_EXECUTOR_H_
#include <cstdint>
#include <functional>
@@ -22,7 +22,7 @@
#include "platform/api/cancelable.h"
#include "platform/api/executor.h"
#include "platform/base/runnable.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
@@ -47,4 +47,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_SCHEDULED_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_SCHEDULED_EXECUTOR_H_
diff --git a/cpp/platform/api/server_sync.h b/cpp/platform/api/server_sync.h
index 234c188..32c11ac 100644
--- a/cpp/platform/api/server_sync.h
+++ b/cpp/platform/api/server_sync.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_SERVER_SYNC_H_
-#define PLATFORM_API_SERVER_SYNC_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_SERVER_SYNC_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_SERVER_SYNC_H_
#include <string>
#include "platform/base/byte_array.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -73,4 +73,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_SERVER_SYNC_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_SERVER_SYNC_H_
diff --git a/cpp/platform/api/settable_future.h b/cpp/platform/api/settable_future.h
index ebbe57c..7f75bd3 100644
--- a/cpp/platform/api/settable_future.h
+++ b/cpp/platform/api/settable_future.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_SETTABLE_FUTURE_H_
-#define PLATFORM_API_SETTABLE_FUTURE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_SETTABLE_FUTURE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_SETTABLE_FUTURE_H_
#include "platform/api/listenable_future.h"
#include "platform/base/exception.h"
@@ -46,4 +46,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_SETTABLE_FUTURE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_SETTABLE_FUTURE_H_
diff --git a/cpp/platform/api/submittable_executor.h b/cpp/platform/api/submittable_executor.h
index 0017c84..403761d 100644
--- a/cpp/platform/api/submittable_executor.h
+++ b/cpp/platform/api/submittable_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_SUBMITTABLE_EXECUTOR_H_
-#define PLATFORM_API_SUBMITTABLE_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_SUBMITTABLE_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_SUBMITTABLE_EXECUTOR_H_
#include <functional>
#include <memory>
@@ -44,4 +44,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_SUBMITTABLE_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_SUBMITTABLE_EXECUTOR_H_
diff --git a/cpp/platform/api/system_clock.h b/cpp/platform/api/system_clock.h
index 9b92751..09f347d 100644
--- a/cpp/platform/api/system_clock.h
+++ b/cpp/platform/api/system_clock.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_SYSTEM_CLOCK_H_
-#define PLATFORM_API_SYSTEM_CLOCK_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_SYSTEM_CLOCK_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_SYSTEM_CLOCK_H_
#include "platform/base/exception.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -34,4 +34,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_SYSTEM_CLOCK_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_SYSTEM_CLOCK_H_
diff --git a/cpp/platform/api/webrtc.h b/cpp/platform/api/webrtc.h
index 16fc30e..e642be6 100644
--- a/cpp/platform/api/webrtc.h
+++ b/cpp/platform/api/webrtc.h
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_WEBRTC_H_
-#define PLATFORM_API_WEBRTC_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_WEBRTC_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_WEBRTC_H_
#include <memory>
#include "proto/connections/offline_wire_formats.pb.h"
#include "proto/connections/offline_wire_formats.pb.h"
#include "platform/base/byte_array.h"
-#include "absl/strings/string_view.h"
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/absl/strings/string_view.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
namespace location {
namespace nearby {
@@ -69,4 +69,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_WEBRTC_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_WEBRTC_H_
diff --git a/cpp/platform/api/wifi.h b/cpp/platform/api/wifi.h
index 1f0f5b7..88d86d1 100644
--- a/cpp/platform/api/wifi.h
+++ b/cpp/platform/api/wifi.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_WIFI_H_
-#define PLATFORM_API_WIFI_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_WIFI_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_WIFI_H_
#include <cstdint>
#include <string>
#include <vector>
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -101,4 +101,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_WIFI_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_WIFI_H_
diff --git a/cpp/platform/api/wifi_lan.h b/cpp/platform/api/wifi_lan.h
index e4ae202..075dc29 100644
--- a/cpp/platform/api/wifi_lan.h
+++ b/cpp/platform/api/wifi_lan.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_API_WIFI_LAN_H_
-#define PLATFORM_API_WIFI_LAN_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_API_WIFI_LAN_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_API_WIFI_LAN_H_
#include <string>
@@ -23,7 +23,7 @@
#include "platform/base/listeners.h"
#include "platform/base/nsd_service_info.h"
#include "platform/base/output_stream.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -128,4 +128,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_API_WIFI_LAN_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_API_WIFI_LAN_H_
diff --git a/cpp/platform/base/BUILD b/cpp/platform/base/BUILD
index b61a8e8..7d4a52a 100644
--- a/cpp/platform/base/BUILD
+++ b/cpp/platform/base/BUILD
@@ -45,12 +45,12 @@
"//platform/api:__subpackages__",
],
deps = [
- "//absl/container:flat_hash_map",
- "//absl/meta:type_traits",
- "//absl/strings",
- "//absl/strings:str_format",
- "//absl/synchronization",
- "//absl/time",
+ "//third_party/absl/container:flat_hash_map",
+ "//third_party/absl/meta:type_traits",
+ "//third_party/absl/strings",
+ "//third_party/absl/strings:str_format",
+ "//third_party/absl/synchronization",
+ "//third_party/absl/time",
],
)
@@ -75,8 +75,8 @@
deps = [
":base",
"//platform/api:types",
- "//absl/base:core_headers",
- "//absl/strings:str_format",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/strings:str_format",
],
)
@@ -113,8 +113,8 @@
deps = [
":base",
":util",
- "//absl/container:flat_hash_set",
- "//absl/synchronization",
+ "//third_party/absl/container:flat_hash_set",
+ "//third_party/absl/synchronization",
],
)
@@ -137,8 +137,8 @@
":logging",
"//platform/api:comm",
"//platform/public:types",
- "//absl/container:flat_hash_map",
- "//absl/strings",
+ "//third_party/absl/container:flat_hash_map",
+ "//third_party/absl/strings",
],
)
diff --git a/cpp/platform/base/base64_utils.cc b/cpp/platform/base/base64_utils.cc
index f985d73..7485009 100644
--- a/cpp/platform/base/base64_utils.cc
+++ b/cpp/platform/base/base64_utils.cc
@@ -15,7 +15,7 @@
#include "platform/base/base64_utils.h"
#include "platform/base/byte_array.h"
-#include "absl/strings/escaping.h"
+#include "third_party/absl/strings/escaping.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/base/base64_utils.h b/cpp/platform/base/base64_utils.h
index 997d035..699ba88 100644
--- a/cpp/platform/base/base64_utils.h
+++ b/cpp/platform/base/base64_utils.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_BASE64_UTILS_H_
-#define PLATFORM_BASE_BASE64_UTILS_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE64_UTILS_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE64_UTILS_H_
#include "platform/base/byte_array.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -30,4 +30,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_BASE64_UTILS_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE64_UTILS_H_
diff --git a/cpp/platform/base/base_input_stream.h b/cpp/platform/base/base_input_stream.h
index b49264e..e8db35a 100644
--- a/cpp/platform/base/base_input_stream.h
+++ b/cpp/platform/base/base_input_stream.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_BASE_INPUT_STREAM_H_
-#define PLATFORM_BASE_BASE_INPUT_STREAM_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_INPUT_STREAM_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_INPUT_STREAM_H_
#include "platform/base/byte_array.h"
#include "platform/base/exception.h"
@@ -54,4 +54,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_BASE_INPUT_STREAM_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_INPUT_STREAM_H_
diff --git a/cpp/platform/base/base_mutex_lock.h b/cpp/platform/base/base_mutex_lock.h
index 8f1612b..84dd2de 100644
--- a/cpp/platform/base/base_mutex_lock.h
+++ b/cpp/platform/base/base_mutex_lock.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_BASE_MUTEX_LOCK_H_
-#define PLATFORM_BASE_BASE_MUTEX_LOCK_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_MUTEX_LOCK_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_MUTEX_LOCK_H_
#include "platform/api/mutex.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -37,4 +37,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_BASE_MUTEX_LOCK_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_MUTEX_LOCK_H_
diff --git a/cpp/platform/base/base_pipe.h b/cpp/platform/base/base_pipe.h
index 95ea71c..4d04741 100644
--- a/cpp/platform/base/base_pipe.h
+++ b/cpp/platform/base/base_pipe.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_BASE_PIPE_H_
-#define PLATFORM_BASE_BASE_PIPE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_PIPE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_PIPE_H_
#include <cstdint>
#include <deque>
@@ -25,7 +25,7 @@
#include "platform/base/exception.h"
#include "platform/base/input_stream.h"
#include "platform/base/output_stream.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -139,4 +139,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_BASE_PIPE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_BASE_PIPE_H_
diff --git a/cpp/platform/base/bluetooth_utils.cc b/cpp/platform/base/bluetooth_utils.cc
index b547c8d..869d917 100644
--- a/cpp/platform/base/bluetooth_utils.cc
+++ b/cpp/platform/base/bluetooth_utils.cc
@@ -14,8 +14,8 @@
#include "platform/base/bluetooth_utils.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_format.h"
+#include "third_party/absl/strings/escaping.h"
+#include "third_party/absl/strings/str_format.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/base/bluetooth_utils.h b/cpp/platform/base/bluetooth_utils.h
index 92ef6b4..cb5bfb9 100644
--- a/cpp/platform/base/bluetooth_utils.h
+++ b/cpp/platform/base/bluetooth_utils.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_BLUETOOTH_UTILS_H_
-#define PLATFORM_BASE_BLUETOOTH_UTILS_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_BLUETOOTH_UTILS_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_BLUETOOTH_UTILS_H_
#include "platform/base/byte_array.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -43,4 +43,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_BLUETOOTH_UTILS_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_BLUETOOTH_UTILS_H_
diff --git a/cpp/platform/base/byte_array.h b/cpp/platform/base/byte_array.h
index 3e12abb..007b90f 100644
--- a/cpp/platform/base/byte_array.h
+++ b/cpp/platform/base/byte_array.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_BYTE_ARRAY_H_
-#define PLATFORM_BASE_BYTE_ARRAY_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_BYTE_ARRAY_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_BYTE_ARRAY_H_
#include <algorithm>
#include <array>
@@ -110,4 +110,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_BYTE_ARRAY_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_BYTE_ARRAY_H_
diff --git a/cpp/platform/base/byte_utils.cc b/cpp/platform/base/byte_utils.cc
index 07af0db..f4fc996 100644
--- a/cpp/platform/base/byte_utils.cc
+++ b/cpp/platform/base/byte_utils.cc
@@ -17,7 +17,7 @@
#include <cstdlib>
#include "platform/base/base_input_stream.h"
-#include "absl/strings/str_format.h"
+#include "third_party/absl/strings/str_format.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/base/byte_utils.h b/cpp/platform/base/byte_utils.h
index e603a5f..b4a30a3 100644
--- a/cpp/platform/base/byte_utils.h
+++ b/cpp/platform/base/byte_utils.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_BYTE_UTILS_H_
-#define PLATFORM_BASE_BYTE_UTILS_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_BYTE_UTILS_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_BYTE_UTILS_H_
#include "platform/base/byte_array.h"
@@ -35,4 +35,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_BYTE_UTILS_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_BYTE_UTILS_H_
diff --git a/cpp/platform/base/callable.h b/cpp/platform/base/callable.h
index 167be58..cae1fa2 100644
--- a/cpp/platform/base/callable.h
+++ b/cpp/platform/base/callable.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_CALLABLE_H_
-#define PLATFORM_BASE_CALLABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_CALLABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_CALLABLE_H_
#include <functional>
@@ -34,4 +34,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_CALLABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_CALLABLE_H_
diff --git a/cpp/platform/base/cancellation_flag.h b/cpp/platform/base/cancellation_flag.h
index e861bfe..a5c2480 100644
--- a/cpp/platform/base/cancellation_flag.h
+++ b/cpp/platform/base/cancellation_flag.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_CANCELLATION_FLAG_H_
-#define PLATFORM_BASE_CANCELLATION_FLAG_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_CANCELLATION_FLAG_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_CANCELLATION_FLAG_H_
#include <memory>
-#include "absl/container/flat_hash_set.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -77,4 +77,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_CANCELLATION_FLAG_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_CANCELLATION_FLAG_H_
diff --git a/cpp/platform/base/cancellation_flag_listener.h b/cpp/platform/base/cancellation_flag_listener.h
index 8a5d9d3..b4316b2 100644
--- a/cpp/platform/base/cancellation_flag_listener.h
+++ b/cpp/platform/base/cancellation_flag_listener.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_CANCELLATION_FLAG_LISTENER_H_
-#define PLATFORM_BASE_CANCELLATION_FLAG_LISTENER_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_CANCELLATION_FLAG_LISTENER_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_CANCELLATION_FLAG_LISTENER_H_
#include "platform/base/cancellation_flag.h"
@@ -40,4 +40,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_CANCELLATION_FLAG_LISTENER_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_CANCELLATION_FLAG_LISTENER_H_
diff --git a/cpp/platform/base/exception.h b/cpp/platform/base/exception.h
index 904f91a..df7eeef 100644
--- a/cpp/platform/base/exception.h
+++ b/cpp/platform/base/exception.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_EXCEPTION_H_
-#define PLATFORM_BASE_EXCEPTION_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_EXCEPTION_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_EXCEPTION_H_
#include <utility>
-#include "absl/meta/type_traits.h"
+#include "third_party/absl/meta/type_traits.h"
namespace location {
namespace nearby {
@@ -109,4 +109,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_EXCEPTION_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_EXCEPTION_H_
diff --git a/cpp/platform/base/feature_flags.h b/cpp/platform/base/feature_flags.h
index ff30b43..55e23fe 100644
--- a/cpp/platform/base/feature_flags.h
+++ b/cpp/platform/base/feature_flags.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_FEATURE_FLAGS_H_
-#define PLATFORM_BASE_FEATURE_FLAGS_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_FEATURE_FLAGS_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_FEATURE_FLAGS_H_
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -62,4 +62,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_FEATURE_FLAGS_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_FEATURE_FLAGS_H_
diff --git a/cpp/platform/base/input_stream.h b/cpp/platform/base/input_stream.h
index 24d9ef3..ed54aee 100644
--- a/cpp/platform/base/input_stream.h
+++ b/cpp/platform/base/input_stream.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_INPUT_STREAM_H_
-#define PLATFORM_BASE_INPUT_STREAM_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_INPUT_STREAM_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_INPUT_STREAM_H_
#include <cstdint>
@@ -39,4 +39,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_INPUT_STREAM_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_INPUT_STREAM_H_
diff --git a/cpp/platform/base/listeners.h b/cpp/platform/base/listeners.h
index 987e4d6..b343d0e 100644
--- a/cpp/platform/base/listeners.h
+++ b/cpp/platform/base/listeners.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_LISTENERS_H_
-#define PLATFORM_BASE_LISTENERS_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_LISTENERS_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_LISTENERS_H_
#include <functional>
@@ -31,4 +31,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_LISTENERS_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_LISTENERS_H_
diff --git a/cpp/platform/base/logging.h b/cpp/platform/base/logging.h
index 36a6416..79470f2 100644
--- a/cpp/platform/base/logging.h
+++ b/cpp/platform/base/logging.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_LOGGING_H_
-#define PLATFORM_BASE_LOGGING_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_LOGGING_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_LOGGING_H_
#include "platform/api/log_message.h"
#include "platform/api/platform.h"
@@ -79,4 +79,4 @@
NEARBY_LOG_IS_ON(severity) \
? NEARBY_LOG_MESSAGE(severity)->Print(__VA_ARGS__) : (void)0
-#endif // PLATFORM_BASE_LOGGING_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_LOGGING_H_
diff --git a/cpp/platform/base/medium_environment.h b/cpp/platform/base/medium_environment.h
index 15eb0be..8acafe5 100644
--- a/cpp/platform/base/medium_environment.h
+++ b/cpp/platform/base/medium_environment.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_MEDIUM_ENVIRONMENT_H_
-#define PLATFORM_BASE_MEDIUM_ENVIRONMENT_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_MEDIUM_ENVIRONMENT_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_MEDIUM_ENVIRONMENT_H_
#include <atomic>
@@ -25,8 +25,8 @@
#include "platform/base/listeners.h"
#include "platform/base/nsd_service_info.h"
#include "platform/public/single_thread_executor.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -330,4 +330,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_MEDIUM_ENVIRONMENT_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_MEDIUM_ENVIRONMENT_H_
diff --git a/cpp/platform/base/nsd_service_info.h b/cpp/platform/base/nsd_service_info.h
index 4688b91..406d337 100644
--- a/cpp/platform/base/nsd_service_info.h
+++ b/cpp/platform/base/nsd_service_info.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_NSD_SERVICE_INFO_H_
-#define PLATFORM_BASE_NSD_SERVICE_INFO_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_NSD_SERVICE_INFO_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_NSD_SERVICE_INFO_H_
#include <string>
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -78,4 +78,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_NSD_SERVICE_INFO_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_NSD_SERVICE_INFO_H_
diff --git a/cpp/platform/base/output_stream.h b/cpp/platform/base/output_stream.h
index 7048419..f29507f 100644
--- a/cpp/platform/base/output_stream.h
+++ b/cpp/platform/base/output_stream.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_OUTPUT_STREAM_H_
-#define PLATFORM_BASE_OUTPUT_STREAM_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_OUTPUT_STREAM_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_OUTPUT_STREAM_H_
#include "platform/base/byte_array.h"
#include "platform/base/exception.h"
@@ -36,4 +36,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_OUTPUT_STREAM_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_OUTPUT_STREAM_H_
diff --git a/cpp/platform/base/payload_id.h b/cpp/platform/base/payload_id.h
index d28eebe..a1ee26c 100644
--- a/cpp/platform/base/payload_id.h
+++ b/cpp/platform/base/payload_id.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_PAYLOAD_ID_H_
-#define PLATFORM_BASE_PAYLOAD_ID_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_PAYLOAD_ID_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_PAYLOAD_ID_H_
#include <cstdint>
@@ -25,4 +25,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_PAYLOAD_ID_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_PAYLOAD_ID_H_
diff --git a/cpp/platform/base/prng.cc b/cpp/platform/base/prng.cc
index 9ae71ab..ed372de 100644
--- a/cpp/platform/base/prng.cc
+++ b/cpp/platform/base/prng.cc
@@ -16,7 +16,7 @@
#include <limits>
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/base/prng.h b/cpp/platform/base/prng.h
index a4afb49..98ed819 100644
--- a/cpp/platform/base/prng.h
+++ b/cpp/platform/base/prng.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_PRNG_H_
-#define PLATFORM_BASE_PRNG_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_PRNG_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_PRNG_H_
#include <cstdint>
@@ -34,4 +34,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_PRNG_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_PRNG_H_
diff --git a/cpp/platform/base/runnable.h b/cpp/platform/base/runnable.h
index 24f2349..178ed4f 100644
--- a/cpp/platform/base/runnable.h
+++ b/cpp/platform/base/runnable.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_RUNNABLE_H_
-#define PLATFORM_BASE_RUNNABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_RUNNABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_RUNNABLE_H_
#include <functional>
@@ -30,4 +30,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_RUNNABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_RUNNABLE_H_
diff --git a/cpp/platform/base/socket.h b/cpp/platform/base/socket.h
index 09211c1..b590ce8 100644
--- a/cpp/platform/base/socket.h
+++ b/cpp/platform/base/socket.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_SOCKET_H_
-#define PLATFORM_BASE_SOCKET_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_SOCKET_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_SOCKET_H_
#include "platform/base/input_stream.h"
#include "platform/base/output_stream.h"
@@ -36,4 +36,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_SOCKET_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_SOCKET_H_
diff --git a/cpp/platform/base/types.h b/cpp/platform/base/types.h
index d082b26..4ff9c3d 100644
--- a/cpp/platform/base/types.h
+++ b/cpp/platform/base/types.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_BASE_TYPES_H_
-#define PLATFORM_BASE_TYPES_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_BASE_TYPES_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_BASE_TYPES_H_
#include <type_traits>
@@ -41,4 +41,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_BASE_TYPES_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_BASE_TYPES_H_
diff --git a/cpp/platform/config/config.h b/cpp/platform/config/config.h
index 80b3780..eaa8c14 100644
--- a/cpp/platform/config/config.h
+++ b/cpp/platform/config/config.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_CONFIG_CONFIG_H_
-#define PLATFORM_CONFIG_CONFIG_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_CONFIG_CONFIG_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_CONFIG_CONFIG_H_
// Clients can modify this file to customize the Nearby C++ codebase as per
// their particular constraints and environments.
@@ -33,4 +33,4 @@
#define NEARBY_USE_RTTI 1
#endif
-#endif // PLATFORM_CONFIG_CONFIG_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_CONFIG_CONFIG_H_
diff --git a/cpp/platform/config/string.h b/cpp/platform/config/string.h
index ad0282f..9ba0388 100644
--- a/cpp/platform/config/string.h
+++ b/cpp/platform/config/string.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_CONFIG_STRING_H_
-#define PLATFORM_CONFIG_STRING_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_CONFIG_STRING_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_CONFIG_STRING_H_
#include <string>
@@ -23,4 +23,4 @@
using std::string;
#endif
-#endif // PLATFORM_CONFIG_STRING_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_CONFIG_STRING_H_
diff --git a/cpp/platform/impl/g3/BUILD b/cpp/platform/impl/g3/BUILD
index 50826f7..886e9ae 100644
--- a/cpp/platform/impl/g3/BUILD
+++ b/cpp/platform/impl/g3/BUILD
@@ -40,9 +40,9 @@
"//platform/base",
"//platform/base:util",
"//platform/impl/shared:posix_mutex",
- "//absl/base:core_headers",
- "//absl/synchronization",
- "//absl/time",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/synchronization",
+ "//third_party/absl/time",
"//thread",
],
)
@@ -72,14 +72,14 @@
"//platform/base:cancellation_flag",
"//platform/base:logging",
"//platform/base:test_util",
- "//absl/base:core_headers",
- "//absl/container:flat_hash_map",
- "//absl/container:flat_hash_set",
- "//absl/strings",
- "//absl/synchronization",
- "//webrtc/api:create_peerconnection_factory", #buildcleaner: keep
- "//webrtc/api:libjingle_peerconnection_api",
- "//webrtc/api/task_queue:default_task_queue_factory",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/container:flat_hash_map",
+ "//third_party/absl/container:flat_hash_set",
+ "//third_party/absl/strings",
+ "//third_party/absl/synchronization",
+ "//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory", #buildcleaner: keep
+ "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
+ "//third_party/webrtc/files/stable/webrtc/api/task_queue:default_task_queue_factory",
],
)
@@ -93,8 +93,8 @@
deps = [
"//platform/api:types",
"//platform/base",
- "//absl/strings",
- "//openssl:crypto",
+ "//third_party/absl/strings",
+ "//third_party/openssl:crypto",
],
)
@@ -117,9 +117,9 @@
"//platform/api:types",
"//platform/base:test_util",
"//platform/impl/shared:file",
- "//absl/base:core_headers",
- "//absl/memory",
- "//absl/strings",
- "//absl/time",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/memory",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
],
)
diff --git a/cpp/platform/impl/g3/atomic_boolean.h b/cpp/platform/impl/g3/atomic_boolean.h
index 68f7407..96ac82a 100644
--- a/cpp/platform/impl/g3/atomic_boolean.h
+++ b/cpp/platform/impl/g3/atomic_boolean.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_ATOMIC_BOOLEAN_H_
-#define PLATFORM_IMPL_G3_ATOMIC_BOOLEAN_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_ATOMIC_BOOLEAN_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_ATOMIC_BOOLEAN_H_
#include <atomic>
@@ -41,4 +41,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_ATOMIC_BOOLEAN_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_ATOMIC_BOOLEAN_H_
diff --git a/cpp/platform/impl/g3/atomic_reference.h b/cpp/platform/impl/g3/atomic_reference.h
index 523992b..1cd5942 100644
--- a/cpp/platform/impl/g3/atomic_reference.h
+++ b/cpp/platform/impl/g3/atomic_reference.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_ATOMIC_REFERENCE_H_
-#define PLATFORM_IMPL_G3_ATOMIC_REFERENCE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_ATOMIC_REFERENCE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_ATOMIC_REFERENCE_H_
#include <atomic>
#include <cstdint>
@@ -44,4 +44,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_ATOMIC_REFERENCE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_ATOMIC_REFERENCE_H_
diff --git a/cpp/platform/impl/g3/ble.cc b/cpp/platform/impl/g3/ble.cc
index ecd9ac0..3bc66fb 100644
--- a/cpp/platform/impl/g3/ble.cc
+++ b/cpp/platform/impl/g3/ble.cc
@@ -22,7 +22,7 @@
#include "platform/base/cancellation_flag_listener.h"
#include "platform/base/logging.h"
#include "platform/base/medium_environment.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/ble.h b/cpp/platform/impl/g3/ble.h
index dfa3d6f..272a20e 100644
--- a/cpp/platform/impl/g3/ble.h
+++ b/cpp/platform/impl/g3/ble.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_BLE_H_
-#define PLATFORM_IMPL_G3_BLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLE_H_
#include <memory>
#include <string>
@@ -26,10 +26,10 @@
#include "platform/impl/g3/bluetooth_classic.h"
#include "platform/impl/g3/multi_thread_executor.h"
#include "platform/impl/g3/pipe.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/strings/escaping.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/strings/escaping.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -227,4 +227,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_BLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLE_H_
diff --git a/cpp/platform/impl/g3/bluetooth_adapter.h b/cpp/platform/impl/g3/bluetooth_adapter.h
index 52f85b5..eb52e6e 100644
--- a/cpp/platform/impl/g3/bluetooth_adapter.h
+++ b/cpp/platform/impl/g3/bluetooth_adapter.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_BLUETOOTH_ADAPTER_H_
-#define PLATFORM_IMPL_G3_BLUETOOTH_ADAPTER_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLUETOOTH_ADAPTER_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLUETOOTH_ADAPTER_H_
#include <string>
@@ -21,9 +21,9 @@
#include "platform/api/bluetooth_adapter.h"
#include "platform/api/bluetooth_classic.h"
#include "platform/impl/g3/single_thread_executor.h"
-#include "absl/base/thread_annotations.h"
-#include "absl/strings/string_view.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/base/thread_annotations.h"
+#include "third_party/absl/strings/string_view.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -139,4 +139,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_BLUETOOTH_ADAPTER_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLUETOOTH_ADAPTER_H_
diff --git a/cpp/platform/impl/g3/bluetooth_classic.cc b/cpp/platform/impl/g3/bluetooth_classic.cc
index 995b93a..be02dac 100644
--- a/cpp/platform/impl/g3/bluetooth_classic.cc
+++ b/cpp/platform/impl/g3/bluetooth_classic.cc
@@ -22,7 +22,7 @@
#include "platform/base/logging.h"
#include "platform/base/medium_environment.h"
#include "platform/impl/g3/bluetooth_adapter.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/bluetooth_classic.h b/cpp/platform/impl/g3/bluetooth_classic.h
index 393e4c5..e1c28ad 100644
--- a/cpp/platform/impl/g3/bluetooth_classic.h
+++ b/cpp/platform/impl/g3/bluetooth_classic.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_BLUETOOTH_CLASSIC_H_
-#define PLATFORM_IMPL_G3_BLUETOOTH_CLASSIC_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLUETOOTH_CLASSIC_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLUETOOTH_CLASSIC_H_
#include <memory>
#include <string>
@@ -26,9 +26,9 @@
#include "platform/base/output_stream.h"
#include "platform/impl/g3/bluetooth_adapter.h"
#include "platform/impl/g3/pipe.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -236,4 +236,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_BLUETOOTH_CLASSIC_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_BLUETOOTH_CLASSIC_H_
diff --git a/cpp/platform/impl/g3/condition_variable.h b/cpp/platform/impl/g3/condition_variable.h
index a279f46..9842f26 100644
--- a/cpp/platform/impl/g3/condition_variable.h
+++ b/cpp/platform/impl/g3/condition_variable.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_CONDITION_VARIABLE_H_
-#define PLATFORM_IMPL_G3_CONDITION_VARIABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_CONDITION_VARIABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_CONDITION_VARIABLE_H_
#include "platform/api/condition_variable.h"
#include "platform/base/exception.h"
#include "platform/impl/g3/mutex.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -48,4 +48,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_CONDITION_VARIABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_CONDITION_VARIABLE_H_
diff --git a/cpp/platform/impl/g3/count_down_latch.h b/cpp/platform/impl/g3/count_down_latch.h
index 7633819..3947928 100644
--- a/cpp/platform/impl/g3/count_down_latch.h
+++ b/cpp/platform/impl/g3/count_down_latch.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_COUNT_DOWN_LATCH_H_
-#define PLATFORM_IMPL_G3_COUNT_DOWN_LATCH_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_COUNT_DOWN_LATCH_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_COUNT_DOWN_LATCH_H_
#include "platform/api/count_down_latch.h"
-#include "absl/base/thread_annotations.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/base/thread_annotations.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -70,4 +70,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_COUNT_DOWN_LATCH_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_COUNT_DOWN_LATCH_H_
diff --git a/cpp/platform/impl/g3/crypto.cc b/cpp/platform/impl/g3/crypto.cc
index ee4de66..ea332ce 100644
--- a/cpp/platform/impl/g3/crypto.cc
+++ b/cpp/platform/impl/g3/crypto.cc
@@ -18,8 +18,8 @@
#include <string>
#include "platform/base/byte_array.h"
-#include "absl/strings/string_view.h"
-#include "openssl/digest.h"
+#include "third_party/absl/strings/string_view.h"
+#include "third_party/openssl/digest.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/log_message.h b/cpp/platform/impl/g3/log_message.h
index 8e03cbf..3777df6 100644
--- a/cpp/platform/impl/g3/log_message.h
+++ b/cpp/platform/impl/g3/log_message.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_LOG_MESSAGE_H_
-#define PLATFORM_IMPL_G3_LOG_MESSAGE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_LOG_MESSAGE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_LOG_MESSAGE_H_
#include "base/logging.h"
#include "platform/api/log_message.h"
@@ -41,4 +41,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_LOG_MESSAGE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_LOG_MESSAGE_H_
diff --git a/cpp/platform/impl/g3/multi_thread_executor.h b/cpp/platform/impl/g3/multi_thread_executor.h
index 8253559..d92c87b 100644
--- a/cpp/platform/impl/g3/multi_thread_executor.h
+++ b/cpp/platform/impl/g3/multi_thread_executor.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_MULTI_THREAD_EXECUTOR_H_
-#define PLATFORM_IMPL_G3_MULTI_THREAD_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_MULTI_THREAD_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_MULTI_THREAD_EXECUTOR_H_
#include <atomic>
#include "platform/api/submittable_executor.h"
#include "platform/impl/g3/count_down_latch.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
#include "thread/threadpool.h"
namespace location {
@@ -70,4 +70,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_MULTI_THREAD_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_MULTI_THREAD_EXECUTOR_H_
diff --git a/cpp/platform/impl/g3/mutex.h b/cpp/platform/impl/g3/mutex.h
index f447b56..e65957d 100644
--- a/cpp/platform/impl/g3/mutex.h
+++ b/cpp/platform/impl/g3/mutex.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_MUTEX_H_
-#define PLATFORM_IMPL_G3_MUTEX_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_MUTEX_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_MUTEX_H_
#include "platform/api/mutex.h"
#include "platform/impl/shared/posix_mutex.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -58,4 +58,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_MUTEX_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_MUTEX_H_
diff --git a/cpp/platform/impl/g3/pipe.h b/cpp/platform/impl/g3/pipe.h
index ab27bb0..7b4d3a5 100644
--- a/cpp/platform/impl/g3/pipe.h
+++ b/cpp/platform/impl/g3/pipe.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_PIPE_H_
-#define PLATFORM_IMPL_G3_PIPE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_PIPE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_PIPE_H_
#include <memory>
@@ -41,4 +41,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_PIPE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_PIPE_H_
diff --git a/cpp/platform/impl/g3/platform.cc b/cpp/platform/impl/g3/platform.cc
index 9884ba7..48dc525 100644
--- a/cpp/platform/impl/g3/platform.cc
+++ b/cpp/platform/impl/g3/platform.cc
@@ -47,10 +47,10 @@
#include "platform/impl/g3/webrtc.h"
#include "platform/impl/g3/wifi_lan.h"
#include "platform/impl/shared/file.h"
-#include "absl/base/integral_types.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "absl/time/time.h"
+#include "third_party/absl/base/integral_types.h"
+#include "third_party/absl/memory/memory.h"
+#include "third_party/absl/strings/str_cat.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/scheduled_executor.cc b/cpp/platform/impl/g3/scheduled_executor.cc
index 480b537..ad8080d 100644
--- a/cpp/platform/impl/g3/scheduled_executor.cc
+++ b/cpp/platform/impl/g3/scheduled_executor.cc
@@ -19,7 +19,7 @@
#include "platform/api/cancelable.h"
#include "platform/base/runnable.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/scheduled_executor.h b/cpp/platform/impl/g3/scheduled_executor.h
index 1b5b5e3..0474d7d 100644
--- a/cpp/platform/impl/g3/scheduled_executor.h
+++ b/cpp/platform/impl/g3/scheduled_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_SCHEDULED_EXECUTOR_H_
-#define PLATFORM_IMPL_G3_SCHEDULED_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_SCHEDULED_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_SCHEDULED_EXECUTOR_H_
#include <atomic>
#include <memory>
@@ -22,7 +22,7 @@
#include "platform/api/scheduled_executor.h"
#include "platform/base/runnable.h"
#include "platform/impl/g3/single_thread_executor.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
#include "thread/threadpool.h"
namespace location {
@@ -56,4 +56,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_SCHEDULED_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_SCHEDULED_EXECUTOR_H_
diff --git a/cpp/platform/impl/g3/single_thread_executor.h b/cpp/platform/impl/g3/single_thread_executor.h
index 29ef3e8..4d2b1d2 100644
--- a/cpp/platform/impl/g3/single_thread_executor.h
+++ b/cpp/platform/impl/g3/single_thread_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_SINGLE_THREAD_EXECUTOR_H_
-#define PLATFORM_IMPL_G3_SINGLE_THREAD_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_SINGLE_THREAD_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_SINGLE_THREAD_EXECUTOR_H_
#include "platform/impl/g3/multi_thread_executor.h"
@@ -33,4 +33,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_SINGLE_THREAD_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_SINGLE_THREAD_EXECUTOR_H_
diff --git a/cpp/platform/impl/g3/system_clock.cc b/cpp/platform/impl/g3/system_clock.cc
index 3f7411c..8f87456 100644
--- a/cpp/platform/impl/g3/system_clock.cc
+++ b/cpp/platform/impl/g3/system_clock.cc
@@ -15,7 +15,7 @@
#include "platform/api/system_clock.h"
#include "platform/base/exception.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/webrtc.cc b/cpp/platform/impl/g3/webrtc.cc
index c02cde7..905cc5f 100644
--- a/cpp/platform/impl/g3/webrtc.cc
+++ b/cpp/platform/impl/g3/webrtc.cc
@@ -17,7 +17,7 @@
#include <memory>
#include "platform/base/medium_environment.h"
-#include "webrtc/api/task_queue/default_task_queue_factory.h"
+#include "third_party/webrtc/files/stable/webrtc/api/task_queue/default_task_queue_factory.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/webrtc.h b/cpp/platform/impl/g3/webrtc.h
index 14930f5..24f22c8 100644
--- a/cpp/platform/impl/g3/webrtc.h
+++ b/cpp/platform/impl/g3/webrtc.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_WEBRTC_H_
-#define PLATFORM_IMPL_G3_WEBRTC_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_WEBRTC_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_WEBRTC_H_
#include <memory>
#include "platform/api/webrtc.h"
#include "platform/impl/g3/single_thread_executor.h"
-#include "absl/strings/string_view.h"
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/absl/strings/string_view.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
namespace location {
namespace nearby {
@@ -78,4 +78,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_WEBRTC_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_WEBRTC_H_
diff --git a/cpp/platform/impl/g3/wifi_lan.cc b/cpp/platform/impl/g3/wifi_lan.cc
index 31b2732..108e480 100644
--- a/cpp/platform/impl/g3/wifi_lan.cc
+++ b/cpp/platform/impl/g3/wifi_lan.cc
@@ -24,7 +24,7 @@
#include "platform/base/medium_environment.h"
#include "platform/base/nsd_service_info.h"
#include "platform/base/prng.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/g3/wifi_lan.h b/cpp/platform/impl/g3/wifi_lan.h
index bfa552e..740a726 100644
--- a/cpp/platform/impl/g3/wifi_lan.h
+++ b/cpp/platform/impl/g3/wifi_lan.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_G3_WIFI_LAN_H_
-#define PLATFORM_IMPL_G3_WIFI_LAN_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_WIFI_LAN_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_WIFI_LAN_H_
#include <memory>
#include <string>
@@ -26,9 +26,9 @@
#include "platform/base/output_stream.h"
#include "platform/impl/g3/multi_thread_executor.h"
#include "platform/impl/g3/pipe.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_set.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -255,4 +255,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_G3_WIFI_LAN_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_G3_WIFI_LAN_H_
diff --git a/cpp/platform/impl/ios/BUILD b/cpp/platform/impl/ios/BUILD
index 4d84ab3..7773e1f 100644
--- a/cpp/platform/impl/ios/BUILD
+++ b/cpp/platform/impl/ios/BUILD
@@ -39,9 +39,9 @@
"//platform/base",
"//platform/base:util",
"//platform/impl/shared:posix_mutex",
- "//absl/base:core_headers",
- "//absl/synchronization",
- "//absl/time",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/synchronization",
+ "//third_party/absl/time",
"//thread",
],
)
@@ -58,9 +58,9 @@
"//platform/api:platform",
"//platform/api:types",
"//platform/impl/shared:file",
- "//absl/base:core_headers",
- "//absl/memory",
- "//absl/strings",
- "//absl/time",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/memory",
+ "//third_party/absl/strings",
+ "//third_party/absl/time",
],
)
diff --git a/cpp/platform/impl/ios/atomic_boolean.h b/cpp/platform/impl/ios/atomic_boolean.h
index d992a47..6856993 100644
--- a/cpp/platform/impl/ios/atomic_boolean.h
+++ b/cpp/platform/impl/ios/atomic_boolean.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_
-#define PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_
#include <atomic>
@@ -39,4 +39,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_ATOMIC_BOOLEAN_H_
diff --git a/cpp/platform/impl/ios/atomic_reference.h b/cpp/platform/impl/ios/atomic_reference.h
index df0ebe5..08cc0a9 100644
--- a/cpp/platform/impl/ios/atomic_reference.h
+++ b/cpp/platform/impl/ios/atomic_reference.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_ATOMIC_REFERENCE_H_
-#define PLATFORM_IMPL_IOS_ATOMIC_REFERENCE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_ATOMIC_REFERENCE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_ATOMIC_REFERENCE_H_
#include <atomic>
#include <cstdint>
@@ -44,4 +44,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_ATOMIC_REFERENCE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_ATOMIC_REFERENCE_H_
diff --git a/cpp/platform/impl/ios/condition_variable.h b/cpp/platform/impl/ios/condition_variable.h
index ad6be99..fc07ac0 100644
--- a/cpp/platform/impl/ios/condition_variable.h
+++ b/cpp/platform/impl/ios/condition_variable.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_
-#define PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_
#include "platform/api/condition_variable.h"
#include "platform/base/exception.h"
#include "platform/impl/ios/mutex.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -48,4 +48,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_CONDITION_VARIABLE_H_
diff --git a/cpp/platform/impl/ios/count_down_latch.h b/cpp/platform/impl/ios/count_down_latch.h
index ae069ff..6ee8638 100644
--- a/cpp/platform/impl/ios/count_down_latch.h
+++ b/cpp/platform/impl/ios/count_down_latch.h
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_
-#define PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_
#include "platform/api/count_down_latch.h"
-#include "absl/base/thread_annotations.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/base/thread_annotations.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
@@ -66,4 +66,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_COUNT_DOWN_LATCH_H_
diff --git a/cpp/platform/impl/ios/log_message.h b/cpp/platform/impl/ios/log_message.h
index 8b72c07..a94e91f 100644
--- a/cpp/platform/impl/ios/log_message.h
+++ b/cpp/platform/impl/ios/log_message.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
-#define PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
#include "base/logging.h"
#include "platform/api/log_message.h"
@@ -39,4 +39,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_LOG_MESSAGE_H_
diff --git a/cpp/platform/impl/ios/multi_thread_executor.h b/cpp/platform/impl/ios/multi_thread_executor.h
index 873b7e1..4676734 100644
--- a/cpp/platform/impl/ios/multi_thread_executor.h
+++ b/cpp/platform/impl/ios/multi_thread_executor.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
-#define PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
#include <atomic>
#include "platform/api/submittable_executor.h"
#include "platform/impl/ios/count_down_latch.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
#include "thread/threadpool.h"
namespace location {
@@ -68,4 +68,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
diff --git a/cpp/platform/impl/ios/mutex.h b/cpp/platform/impl/ios/mutex.h
index a43e44a..7307a0a 100644
--- a/cpp/platform/impl/ios/mutex.h
+++ b/cpp/platform/impl/ios/mutex.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_MUTEX_H_
-#define PLATFORM_IMPL_IOS_MUTEX_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_MUTEX_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_MUTEX_H_
#include "platform/api/mutex.h"
#include "platform/impl/shared/posix_mutex.h"
-#include "absl/synchronization/mutex.h"
+#include "third_party/absl/synchronization/mutex.h"
namespace location {
namespace nearby {
@@ -58,4 +58,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_MUTEX_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_MUTEX_H_
diff --git a/cpp/platform/impl/ios/platform.mm b/cpp/platform/impl/ios/platform.mm
index fd80892..f5278d1 100644
--- a/cpp/platform/impl/ios/platform.mm
+++ b/cpp/platform/impl/ios/platform.mm
@@ -35,7 +35,7 @@
#include "platform/impl/ios/scheduled_executor.h"
#include "platform/impl/ios/single_thread_executor.h"
#include "platform/impl/shared/file.h"
-#include "absl/memory/memory.h"
+#include "third_party/absl/memory/memory.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/ios/scheduled_executor.h b/cpp/platform/impl/ios/scheduled_executor.h
index 9ef9558..77a55b3 100644
--- a/cpp/platform/impl/ios/scheduled_executor.h
+++ b/cpp/platform/impl/ios/scheduled_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_
-#define PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_
#include <atomic>
#include <memory>
@@ -22,7 +22,7 @@
#include "platform/api/scheduled_executor.h"
#include "platform/base/runnable.h"
#include "platform/impl/ios/single_thread_executor.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
#include "thread/threadpool.h"
namespace location {
@@ -54,4 +54,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_SCHEDULED_EXECUTOR_H_
diff --git a/cpp/platform/impl/ios/scheduled_executor.mm b/cpp/platform/impl/ios/scheduled_executor.mm
index c12b984..58e89aa 100644
--- a/cpp/platform/impl/ios/scheduled_executor.mm
+++ b/cpp/platform/impl/ios/scheduled_executor.mm
@@ -19,7 +19,7 @@
#include "platform/api/cancelable.h"
#include "platform/base/runnable.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/ios/single_thread_executor.h b/cpp/platform/impl/ios/single_thread_executor.h
index 7bd12a0..b12c166 100644
--- a/cpp/platform/impl/ios/single_thread_executor.h
+++ b/cpp/platform/impl/ios/single_thread_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
-#define PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
#include "platform/impl/ios/multi_thread_executor.h"
@@ -31,4 +31,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
diff --git a/cpp/platform/impl/shared/BUILD b/cpp/platform/impl/shared/BUILD
index b2c3146..9895989 100644
--- a/cpp/platform/impl/shared/BUILD
+++ b/cpp/platform/impl/shared/BUILD
@@ -55,7 +55,7 @@
deps = [
"//platform/api:types",
"//platform/base",
- "//absl/strings",
+ "//third_party/absl/strings",
],
)
@@ -67,6 +67,6 @@
"//file/util:temp_path",
"//platform/base",
"//testing/base/public:gunit_main",
- "//absl/strings",
+ "//third_party/absl/strings",
],
)
diff --git a/cpp/platform/impl/shared/file.cc b/cpp/platform/impl/shared/file.cc
index 1dc3727..382566e 100644
--- a/cpp/platform/impl/shared/file.cc
+++ b/cpp/platform/impl/shared/file.cc
@@ -18,7 +18,7 @@
#include <memory>
#include "platform/base/exception.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/shared/file.h b/cpp/platform/impl/shared/file.h
index 907eb39..c3b67db 100644
--- a/cpp/platform/impl/shared/file.h
+++ b/cpp/platform/impl/shared/file.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_SHARED_FILE_H_
-#define PLATFORM_IMPL_SHARED_FILE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_FILE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_FILE_H_
#include <cstdint>
#include <fstream>
@@ -21,7 +21,7 @@
#include "platform/api/input_file.h"
#include "platform/api/output_file.h"
#include "platform/base/exception.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -64,4 +64,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_SHARED_FILE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_FILE_H_
diff --git a/cpp/platform/impl/shared/file_test.cc b/cpp/platform/impl/shared/file_test.cc
index 2241ff6..4e2508d 100644
--- a/cpp/platform/impl/shared/file_test.cc
+++ b/cpp/platform/impl/shared/file_test.cc
@@ -22,7 +22,7 @@
#include "file/util/temp_path.h"
#include "platform/base/byte_array.h"
#include "gtest/gtest.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/impl/shared/posix_condition_variable.h b/cpp/platform/impl/shared/posix_condition_variable.h
index e252629..804bcb8 100644
--- a/cpp/platform/impl/shared/posix_condition_variable.h
+++ b/cpp/platform/impl/shared/posix_condition_variable.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_SHARED_POSIX_CONDITION_VARIABLE_H_
-#define PLATFORM_IMPL_SHARED_POSIX_CONDITION_VARIABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_POSIX_CONDITION_VARIABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_POSIX_CONDITION_VARIABLE_H_
#include <pthread.h>
@@ -42,4 +42,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_SHARED_POSIX_CONDITION_VARIABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_POSIX_CONDITION_VARIABLE_H_
diff --git a/cpp/platform/impl/shared/posix_mutex.h b/cpp/platform/impl/shared/posix_mutex.h
index 3128408..bf0d391 100644
--- a/cpp/platform/impl/shared/posix_mutex.h
+++ b/cpp/platform/impl/shared/posix_mutex.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_IMPL_SHARED_POSIX_MUTEX_H_
-#define PLATFORM_IMPL_SHARED_POSIX_MUTEX_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_POSIX_MUTEX_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_POSIX_MUTEX_H_
#include <pthread.h>
@@ -42,4 +42,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_IMPL_SHARED_POSIX_MUTEX_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_IMPL_SHARED_POSIX_MUTEX_H_
diff --git a/cpp/platform/public/BUILD b/cpp/platform/public/BUILD
index 459584d..ac876db 100644
--- a/cpp/platform/public/BUILD
+++ b/cpp/platform/public/BUILD
@@ -57,8 +57,8 @@
"//platform/base",
"//platform/base:logging",
"//platform/base:util",
- "//absl/base:core_headers",
- "//absl/time",
+ "//third_party/absl/base:core_headers",
+ "//third_party/absl/time",
],
)
@@ -89,9 +89,9 @@
"//platform/api:platform",
"//platform/base",
"//platform/base:cancellation_flag",
- "//absl/container:flat_hash_map",
- "//absl/strings",
- "//webrtc/api:libjingle_peerconnection_api",
+ "//third_party/absl/container:flat_hash_map",
+ "//third_party/absl/strings",
+ "//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
],
)
@@ -141,9 +141,9 @@
"//platform/base:test_util",
"//platform/impl/g3", # build_cleaner: keep
"//testing/base/public:gunit_main",
- "//absl/strings",
- "//absl/synchronization",
- "//absl/time",
+ "//third_party/absl/strings",
+ "//third_party/absl/synchronization",
+ "//third_party/absl/time",
],
)
@@ -152,7 +152,7 @@
srcs = ["thread_check_nocompile.cc"],
deps = [
":types",
- "//absl/time",
+ "//third_party/absl/time",
],
)
diff --git a/cpp/platform/public/atomic_boolean.h b/cpp/platform/public/atomic_boolean.h
index 1315a3e..f475659 100644
--- a/cpp/platform/public/atomic_boolean.h
+++ b/cpp/platform/public/atomic_boolean.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_ATOMIC_BOOLEAN_H_
-#define PLATFORM_PUBLIC_ATOMIC_BOOLEAN_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_ATOMIC_BOOLEAN_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_ATOMIC_BOOLEAN_H_
#include <memory>
@@ -47,4 +47,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_ATOMIC_BOOLEAN_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_ATOMIC_BOOLEAN_H_
diff --git a/cpp/platform/public/atomic_reference.h b/cpp/platform/public/atomic_reference.h
index 8f8aaf3..8c081be 100644
--- a/cpp/platform/public/atomic_reference.h
+++ b/cpp/platform/public/atomic_reference.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_ATOMIC_REFERENCE_H_
-#define PLATFORM_PUBLIC_ATOMIC_REFERENCE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_ATOMIC_REFERENCE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_ATOMIC_REFERENCE_H_
#include <memory>
#include <type_traits>
@@ -84,4 +84,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_ATOMIC_REFERENCE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_ATOMIC_REFERENCE_H_
diff --git a/cpp/platform/public/ble.h b/cpp/platform/public/ble.h
index 67be3db..ca7ee59 100644
--- a/cpp/platform/public/ble.h
+++ b/cpp/platform/public/ble.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_BLE_H_
-#define PLATFORM_PUBLIC_BLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLE_H_
#include "platform/api/ble.h"
#include "platform/api/platform.h"
@@ -23,7 +23,7 @@
#include "platform/base/output_stream.h"
#include "platform/public/bluetooth_adapter.h"
#include "platform/public/mutex.h"
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -163,4 +163,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_BLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLE_H_
diff --git a/cpp/platform/public/bluetooth_adapter.h b/cpp/platform/public/bluetooth_adapter.h
index b39d83d..5ad0e02 100644
--- a/cpp/platform/public/bluetooth_adapter.h
+++ b/cpp/platform/public/bluetooth_adapter.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_BLUETOOTH_ADAPTER_H_
-#define PLATFORM_PUBLIC_BLUETOOTH_ADAPTER_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLUETOOTH_ADAPTER_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLUETOOTH_ADAPTER_H_
#include <string>
#include "platform/api/bluetooth_adapter.h"
#include "platform/api/bluetooth_classic.h"
#include "platform/api/platform.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
@@ -125,4 +125,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_BLUETOOTH_ADAPTER_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLUETOOTH_ADAPTER_H_
diff --git a/cpp/platform/public/bluetooth_classic.h b/cpp/platform/public/bluetooth_classic.h
index 62a2ec1..e10dcdc 100644
--- a/cpp/platform/public/bluetooth_classic.h
+++ b/cpp/platform/public/bluetooth_classic.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_BLUETOOTH_CLASSIC_H_
-#define PLATFORM_PUBLIC_BLUETOOTH_CLASSIC_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLUETOOTH_CLASSIC_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLUETOOTH_CLASSIC_H_
#include <memory>
#include <string>
@@ -29,7 +29,7 @@
#include "platform/public/bluetooth_adapter.h"
#include "platform/public/logging.h"
#include "platform/public/mutex.h"
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -232,4 +232,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_BLUETOOTH_CLASSIC_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_BLUETOOTH_CLASSIC_H_
diff --git a/cpp/platform/public/bluetooth_classic_test.cc b/cpp/platform/public/bluetooth_classic_test.cc
index 2f85205..fb843ab 100644
--- a/cpp/platform/public/bluetooth_classic_test.cc
+++ b/cpp/platform/public/bluetooth_classic_test.cc
@@ -23,7 +23,7 @@
#include "platform/public/single_thread_executor.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/cancelable.h b/cpp/platform/public/cancelable.h
index 89b957b..18da895 100644
--- a/cpp/platform/public/cancelable.h
+++ b/cpp/platform/public/cancelable.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_CANCELABLE_H_
-#define PLATFORM_PUBLIC_CANCELABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELABLE_H_
#include <memory>
#include <utility>
@@ -57,4 +57,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_CANCELABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELABLE_H_
diff --git a/cpp/platform/public/cancelable_alarm.h b/cpp/platform/public/cancelable_alarm.h
index e78187b..19a6705 100644
--- a/cpp/platform/public/cancelable_alarm.h
+++ b/cpp/platform/public/cancelable_alarm.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_CANCELABLE_ALARM_H_
-#define PLATFORM_PUBLIC_CANCELABLE_ALARM_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELABLE_ALARM_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELABLE_ALARM_H_
#include <cstdint>
#include <functional>
@@ -72,4 +72,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_CANCELABLE_ALARM_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELABLE_ALARM_H_
diff --git a/cpp/platform/public/cancelable_alarm_test.cc b/cpp/platform/public/cancelable_alarm_test.cc
index 7cb934c..9d3f15d 100644
--- a/cpp/platform/public/cancelable_alarm_test.cc
+++ b/cpp/platform/public/cancelable_alarm_test.cc
@@ -18,7 +18,7 @@
#include "platform/public/scheduled_executor.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/cancellable_task.h b/cpp/platform/public/cancellable_task.h
index dac4cee..3547605 100644
--- a/cpp/platform/public/cancellable_task.h
+++ b/cpp/platform/public/cancellable_task.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_CANCELLABLE_TASK_H_
-#define PLATFORM_PUBLIC_CANCELLABLE_TASK_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELLABLE_TASK_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELLABLE_TASK_H_
#include <utility>
@@ -67,4 +67,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_CANCELLABLE_TASK_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CANCELLABLE_TASK_H_
diff --git a/cpp/platform/public/condition_variable.h b/cpp/platform/public/condition_variable.h
index e6c0408..1ba3ff4 100644
--- a/cpp/platform/public/condition_variable.h
+++ b/cpp/platform/public/condition_variable.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_CONDITION_VARIABLE_H_
-#define PLATFORM_PUBLIC_CONDITION_VARIABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CONDITION_VARIABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CONDITION_VARIABLE_H_
#include "platform/api/condition_variable.h"
#include "platform/api/platform.h"
@@ -46,4 +46,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_CONDITION_VARIABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CONDITION_VARIABLE_H_
diff --git a/cpp/platform/public/condition_variable_test.cc b/cpp/platform/public/condition_variable_test.cc
index f00605f..368ada3 100644
--- a/cpp/platform/public/condition_variable_test.cc
+++ b/cpp/platform/public/condition_variable_test.cc
@@ -20,7 +20,7 @@
#include "platform/public/system_clock.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/count_down_latch.h b/cpp/platform/public/count_down_latch.h
index 09bda5a..22db134 100644
--- a/cpp/platform/public/count_down_latch.h
+++ b/cpp/platform/public/count_down_latch.h
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_COUNT_DOWN_LATCH_H_
-#define PLATFORM_PUBLIC_COUNT_DOWN_LATCH_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_COUNT_DOWN_LATCH_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_COUNT_DOWN_LATCH_H_
#include <cstdint>
#include "platform/api/count_down_latch.h"
#include "platform/api/platform.h"
#include "platform/base/exception.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
@@ -51,4 +51,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_COUNT_DOWN_LATCH_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_COUNT_DOWN_LATCH_H_
diff --git a/cpp/platform/public/crypto.h b/cpp/platform/public/crypto.h
index a41d44e..597f69f 100644
--- a/cpp/platform/public/crypto.h
+++ b/cpp/platform/public/crypto.h
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_CRYPTO_H_
-#define PLATFORM_PUBLIC_CRYPTO_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CRYPTO_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CRYPTO_H_
#include "platform/api/crypto.h"
-#endif // PLATFORM_PUBLIC_CRYPTO_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_CRYPTO_H_
diff --git a/cpp/platform/public/file.h b/cpp/platform/public/file.h
index 0a342b9..7dae668 100644
--- a/cpp/platform/public/file.h
+++ b/cpp/platform/public/file.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_FILE_H_
-#define PLATFORM_PUBLIC_FILE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_FILE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_FILE_H_
#include <cstdint>
#include <memory>
@@ -112,4 +112,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_FILE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_FILE_H_
diff --git a/cpp/platform/public/future.h b/cpp/platform/public/future.h
index a721501..25fcd19 100644
--- a/cpp/platform/public/future.h
+++ b/cpp/platform/public/future.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_FUTURE_H_
-#define PLATFORM_PUBLIC_FUTURE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_FUTURE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_FUTURE_H_
#include "platform/public/settable_future.h"
@@ -55,4 +55,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_FUTURE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_FUTURE_H_
diff --git a/cpp/platform/public/future_test.cc b/cpp/platform/public/future_test.cc
index 3fd443a..4f710f0 100644
--- a/cpp/platform/public/future_test.cc
+++ b/cpp/platform/public/future_test.cc
@@ -16,8 +16,8 @@
#include "platform/public/single_thread_executor.h"
#include "gtest/gtest.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/lockable.h b/cpp/platform/public/lockable.h
index 73d4572..23f4d22 100644
--- a/cpp/platform/public/lockable.h
+++ b/cpp/platform/public/lockable.h
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_LOCKABLE_H_
-#define PLATFORM_PUBLIC_LOCKABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_LOCKABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_LOCKABLE_H_
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -48,4 +48,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_LOCKABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_LOCKABLE_H_
diff --git a/cpp/platform/public/logging.h b/cpp/platform/public/logging.h
index 7d68c1e..6feecaf 100644
--- a/cpp/platform/public/logging.h
+++ b/cpp/platform/public/logging.h
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_LOGGING_H_
-#define PLATFORM_PUBLIC_LOGGING_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_LOGGING_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_LOGGING_H_
#include "platform/base/logging.h"
-#endif // PLATFORM_PUBLIC_LOGGING_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_LOGGING_H_
diff --git a/cpp/platform/public/multi_thread_executor.h b/cpp/platform/public/multi_thread_executor.h
index 6d7ba09..b0e040e 100644
--- a/cpp/platform/public/multi_thread_executor.h
+++ b/cpp/platform/public/multi_thread_executor.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_MULTI_THREAD_EXECUTOR_H_
-#define PLATFORM_PUBLIC_MULTI_THREAD_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MULTI_THREAD_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MULTI_THREAD_EXECUTOR_H_
#include "platform/api/platform.h"
#include "platform/public/submittable_executor.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -40,4 +40,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_MULTI_THREAD_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MULTI_THREAD_EXECUTOR_H_
diff --git a/cpp/platform/public/multi_thread_executor_test.cc b/cpp/platform/public/multi_thread_executor_test.cc
index 5a405d4..39b4306 100644
--- a/cpp/platform/public/multi_thread_executor_test.cc
+++ b/cpp/platform/public/multi_thread_executor_test.cc
@@ -19,9 +19,9 @@
#include "platform/base/exception.h"
#include "gtest/gtest.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/mutex.h b/cpp/platform/public/mutex.h
index f236883..d89f4c2 100644
--- a/cpp/platform/public/mutex.h
+++ b/cpp/platform/public/mutex.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_MUTEX_H_
-#define PLATFORM_PUBLIC_MUTEX_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MUTEX_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MUTEX_H_
#include <memory>
#include "platform/api/mutex.h"
#include "platform/api/platform.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -75,4 +75,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_MUTEX_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MUTEX_H_
diff --git a/cpp/platform/public/mutex_lock.h b/cpp/platform/public/mutex_lock.h
index b5457a1..08da43e 100644
--- a/cpp/platform/public/mutex_lock.h
+++ b/cpp/platform/public/mutex_lock.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_MUTEX_LOCK_H_
-#define PLATFORM_PUBLIC_MUTEX_LOCK_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MUTEX_LOCK_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MUTEX_LOCK_H_
#include "platform/api/mutex.h"
#include "platform/public/mutex.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -42,4 +42,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_MUTEX_LOCK_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_MUTEX_LOCK_H_
diff --git a/cpp/platform/public/mutex_test.cc b/cpp/platform/public/mutex_test.cc
index 00c129b..1eb5e04 100644
--- a/cpp/platform/public/mutex_test.cc
+++ b/cpp/platform/public/mutex_test.cc
@@ -17,9 +17,9 @@
#include "platform/public/condition_variable.h"
#include "platform/public/single_thread_executor.h"
#include "gtest/gtest.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/pipe.h b/cpp/platform/public/pipe.h
index be5ac87..0877466 100644
--- a/cpp/platform/public/pipe.h
+++ b/cpp/platform/public/pipe.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_PIPE_H_
-#define PLATFORM_PUBLIC_PIPE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_PIPE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_PIPE_H_
#include "platform/base/base_pipe.h"
@@ -33,4 +33,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_PIPE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_PIPE_H_
diff --git a/cpp/platform/public/scheduled_executor.h b/cpp/platform/public/scheduled_executor.h
index bd60388..3db6dce 100644
--- a/cpp/platform/public/scheduled_executor.h
+++ b/cpp/platform/public/scheduled_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_SCHEDULED_EXECUTOR_H_
-#define PLATFORM_PUBLIC_SCHEDULED_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SCHEDULED_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SCHEDULED_EXECUTOR_H_
#include <cstdint>
#include <functional>
@@ -29,8 +29,8 @@
#include "platform/public/mutex_lock.h"
#include "platform/public/thread_check_callable.h"
#include "platform/public/thread_check_runnable.h"
-#include "absl/base/thread_annotations.h"
-#include "absl/time/time.h"
+#include "third_party/absl/base/thread_annotations.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
@@ -103,4 +103,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_SCHEDULED_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SCHEDULED_EXECUTOR_H_
diff --git a/cpp/platform/public/scheduled_executor_test.cc b/cpp/platform/public/scheduled_executor_test.cc
index 96e120a..7944879 100644
--- a/cpp/platform/public/scheduled_executor_test.cc
+++ b/cpp/platform/public/scheduled_executor_test.cc
@@ -20,9 +20,9 @@
#include "platform/base/exception.h"
#include "platform/public/count_down_latch.h"
#include "gtest/gtest.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/clock.h"
+#include "third_party/absl/time/time.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/settable_future.h b/cpp/platform/public/settable_future.h
index 512d0e7..fd6f74e 100644
--- a/cpp/platform/public/settable_future.h
+++ b/cpp/platform/public/settable_future.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_SETTABLE_FUTURE_H_
-#define PLATFORM_PUBLIC_SETTABLE_FUTURE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SETTABLE_FUTURE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SETTABLE_FUTURE_H_
#include <utility>
@@ -125,4 +125,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_SETTABLE_FUTURE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SETTABLE_FUTURE_H_
diff --git a/cpp/platform/public/single_thread_executor.h b/cpp/platform/public/single_thread_executor.h
index 015e5c5..0086503 100644
--- a/cpp/platform/public/single_thread_executor.h
+++ b/cpp/platform/public/single_thread_executor.h
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_SINGLE_THREAD_EXECUTOR_H_
-#define PLATFORM_PUBLIC_SINGLE_THREAD_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SINGLE_THREAD_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SINGLE_THREAD_EXECUTOR_H_
#include "platform/public/submittable_executor.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -39,4 +39,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_SINGLE_THREAD_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SINGLE_THREAD_EXECUTOR_H_
diff --git a/cpp/platform/public/single_thread_executor_test.cc b/cpp/platform/public/single_thread_executor_test.cc
index f89773f..afb4e40 100644
--- a/cpp/platform/public/single_thread_executor_test.cc
+++ b/cpp/platform/public/single_thread_executor_test.cc
@@ -19,8 +19,8 @@
#include "platform/base/exception.h"
#include "gtest/gtest.h"
-#include "absl/synchronization/mutex.h"
-#include "absl/time/clock.h"
+#include "third_party/absl/synchronization/mutex.h"
+#include "third_party/absl/time/clock.h"
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/submittable_executor.h b/cpp/platform/public/submittable_executor.h
index c5c6f3a..367d8f2 100644
--- a/cpp/platform/public/submittable_executor.h
+++ b/cpp/platform/public/submittable_executor.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_SUBMITTABLE_EXECUTOR_H_
-#define PLATFORM_PUBLIC_SUBMITTABLE_EXECUTOR_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SUBMITTABLE_EXECUTOR_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SUBMITTABLE_EXECUTOR_H_
#include <cstddef>
#include <functional>
@@ -30,7 +30,7 @@
#include "platform/public/mutex_lock.h"
#include "platform/public/thread_check_callable.h"
#include "platform/public/thread_check_runnable.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -121,4 +121,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_SUBMITTABLE_EXECUTOR_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SUBMITTABLE_EXECUTOR_H_
diff --git a/cpp/platform/public/system_clock.h b/cpp/platform/public/system_clock.h
index df21c63..5e7a063 100644
--- a/cpp/platform/public/system_clock.h
+++ b/cpp/platform/public/system_clock.h
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_SYSTEM_CLOCK_H_
-#define PLATFORM_PUBLIC_SYSTEM_CLOCK_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SYSTEM_CLOCK_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SYSTEM_CLOCK_H_
#include "platform/api/system_clock.h"
-#endif // PLATFORM_PUBLIC_SYSTEM_CLOCK_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_SYSTEM_CLOCK_H_
diff --git a/cpp/platform/public/thread_check_callable.h b/cpp/platform/public/thread_check_callable.h
index cf324b1..2a94d02 100644
--- a/cpp/platform/public/thread_check_callable.h
+++ b/cpp/platform/public/thread_check_callable.h
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_THREAD_CHECK_CALLABLE_H_
-#define PLATFORM_PUBLIC_THREAD_CHECK_CALLABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_THREAD_CHECK_CALLABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_THREAD_CHECK_CALLABLE_H_
#include "platform/base/callable.h"
#include "platform/public/lockable.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -43,4 +43,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_THREAD_CHECK_CALLABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_THREAD_CHECK_CALLABLE_H_
diff --git a/cpp/platform/public/thread_check_nocompile.cc b/cpp/platform/public/thread_check_nocompile.cc
index f7cae73..a3c1132 100644
--- a/cpp/platform/public/thread_check_nocompile.cc
+++ b/cpp/platform/public/thread_check_nocompile.cc
@@ -14,11 +14,11 @@
#include "platform/public/scheduled_executor.h"
#include "platform/public/single_thread_executor.h"
-#include "absl/time/time.h"
+#include "third_party/absl/time/time.h"
// Snippets of invalid code that should trigger an error during thread
// safety analysis at compile time.
-// See https://g3doc.corp.google.com/googletest/g3doc/cpp_nc_test.md
+// See https://g3doc.corp.google.com/third_party/googletest/g3doc/cpp_nc_test.md
namespace location {
namespace nearby {
diff --git a/cpp/platform/public/thread_check_runnable.h b/cpp/platform/public/thread_check_runnable.h
index 7abf6f7..f22b245 100644
--- a/cpp/platform/public/thread_check_runnable.h
+++ b/cpp/platform/public/thread_check_runnable.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_THREAD_CHECK_RUNNABLE_H_
-#define PLATFORM_PUBLIC_THREAD_CHECK_RUNNABLE_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_THREAD_CHECK_RUNNABLE_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_THREAD_CHECK_RUNNABLE_H_
#include <utility>
#include "platform/base/runnable.h"
#include "platform/public/lockable.h"
-#include "absl/base/thread_annotations.h"
+#include "third_party/absl/base/thread_annotations.h"
namespace location {
namespace nearby {
@@ -44,4 +44,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_THREAD_CHECK_RUNNABLE_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_THREAD_CHECK_RUNNABLE_H_
diff --git a/cpp/platform/public/webrtc.h b/cpp/platform/public/webrtc.h
index 56b497e..7217000 100644
--- a/cpp/platform/public/webrtc.h
+++ b/cpp/platform/public/webrtc.h
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_WEBRTC_H_
-#define PLATFORM_PUBLIC_WEBRTC_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_WEBRTC_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_WEBRTC_H_
#include <memory>
#include "platform/api/platform.h"
#include "platform/api/webrtc.h"
-#include "webrtc/api/peer_connection_interface.h"
+#include "third_party/webrtc/files/stable/webrtc/api/peer_connection_interface.h"
namespace location {
namespace nearby {
@@ -96,4 +96,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_WEBRTC_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_WEBRTC_H_
diff --git a/cpp/platform/public/wifi_lan.h b/cpp/platform/public/wifi_lan.h
index fbcca37..0efd04b 100644
--- a/cpp/platform/public/wifi_lan.h
+++ b/cpp/platform/public/wifi_lan.h
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef PLATFORM_PUBLIC_WIFI_LAN_H_
-#define PLATFORM_PUBLIC_WIFI_LAN_H_
+#ifndef LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_WIFI_LAN_H_
+#define LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_WIFI_LAN_H_
#include "platform/api/platform.h"
#include "platform/api/wifi_lan.h"
@@ -23,7 +23,7 @@
#include "platform/base/nsd_service_info.h"
#include "platform/base/output_stream.h"
#include "platform/public/mutex.h"
-#include "absl/container/flat_hash_map.h"
+#include "third_party/absl/container/flat_hash_map.h"
namespace location {
namespace nearby {
@@ -181,4 +181,4 @@
} // namespace nearby
} // namespace location
-#endif // PLATFORM_PUBLIC_WIFI_LAN_H_
+#endif // LOCATION_NEARBY_CPP_PLATFORM_PUBLIC_WIFI_LAN_H_
diff --git a/cpp/platform/public/wifi_lan_test.cc b/cpp/platform/public/wifi_lan_test.cc
index 1798510..f95438a 100644
--- a/cpp/platform/public/wifi_lan_test.cc
+++ b/cpp/platform/public/wifi_lan_test.cc
@@ -21,7 +21,7 @@
#include "platform/public/logging.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "absl/strings/string_view.h"
+#include "third_party/absl/strings/string_view.h"
namespace location {
namespace nearby {
diff --git a/proto/bootstrap_enums.proto b/proto/bootstrap_enums.proto
index 01eb296..67df22f 100644
--- a/proto/bootstrap_enums.proto
+++ b/proto/bootstrap_enums.proto
@@ -16,10 +16,14 @@
package location.nearby.proto;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "BootstrapEnums";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
// Medium used for offline socket.
enum SocketMedium {
diff --git a/proto/connections/offline_wire_formats.proto b/proto/connections/offline_wire_formats.proto
index 5e58253..ed753e2 100644
--- a/proto/connections/offline_wire_formats.proto
+++ b/proto/connections/offline_wire_formats.proto
@@ -302,6 +302,11 @@
optional LocationStandard.Format format = 2;
}
+// nearby:google3-begin
+// Copy from
+// https://source.corp.google.com/piper///depot/google3/media/webrtc/server/tachyon/proto/tachyon_enums.proto;rcl=334271491;l=10242
+// These numbers match must match the original definition.
+// nearby:google3-end
message LocationStandard {
enum Format {
UNKNOWN = 0;
diff --git a/proto/connections_enums.proto b/proto/connections_enums.proto
index 4674a4c..99a814d 100644
--- a/proto/connections_enums.proto
+++ b/proto/connections_enums.proto
@@ -12,15 +12,31 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// nearby:google3-begin
+// Any changes in this file maybe cause the unmapped result in the PLX tables.
+// Please remember to update the table schemas:
+// 1. Check your changes are rolled out in the MPM.
+// https://mpmbrowse.corp.google.com/package/location/nearby/lingo
+// 2. Check the new lingo job is scheduled and completed.
+// https://borgcron-dashboard.corp.google.com/#user=social-copresence-batch
+// 3. Runs PLX script to update schema.
+// https://plx.corp.google.com/scripts2/script_e1._9eb6f3_e3cd_419b_b483_c1e42abc824a
+//
+// Or you can wait one or two days then run the above Step3. dircetly.
+// nearby:google3-end
syntax = "proto2";
package location.nearby.proto.connections;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "ConnectionsEnums";
option objc_class_prefix = "GNCP";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
// The type of event being logged.
// Lightweight START_* and STOP_* events track instances of potential crashes
diff --git a/proto/discovery_enums.proto b/proto/discovery_enums.proto
index 40596e6..56302f6 100644
--- a/proto/discovery_enums.proto
+++ b/proto/discovery_enums.proto
@@ -16,10 +16,15 @@
package location.nearby.proto;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option jspb_use_correct_proto2_semantics = false; // go/jspb-correct-proto2
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "DiscoveryEnums";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
// NEXT ID: 149
enum DiscoveryEvent {
diff --git a/proto/magic_pair_enums.proto b/proto/magic_pair_enums.proto
index a0633f9..b935425 100644
--- a/proto/magic_pair_enums.proto
+++ b/proto/magic_pair_enums.proto
@@ -16,11 +16,15 @@
package location.nearby.proto;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "MagicPairEnums";
option objc_class_prefix = "GNCP";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
// Enums related to logged events. For event codes, see NearbyEventCodes.
message MagicPairEvent {
diff --git a/proto/mediums/ble_frames.proto b/proto/mediums/ble_frames.proto
index 864da31..9b1ed30 100644
--- a/proto/mediums/ble_frames.proto
+++ b/proto/mediums/ble_frames.proto
@@ -23,6 +23,7 @@
// This should map exactly to BleAdvertisement's socket versions.
// TODO(alexanderkang): Make BleAdvertisement reference this proto.
+// https://cs.corp.google.com/piper///depot/google3/java/com/google/android/gmscore/dev/modules/nearby/src/com/google/android/gms/nearby/mediums/bluetoothlowenergy/BleAdvertisement.java?l=57&cl=CS&rcl=214509192
enum SocketVersion {
UNKNOWN_SOCKET_VERSION = 0;
V1 = 1;
diff --git a/proto/nearby_client_enums.proto b/proto/nearby_client_enums.proto
index 42cef7f..19ec4f5 100644
--- a/proto/nearby_client_enums.proto
+++ b/proto/nearby_client_enums.proto
@@ -16,11 +16,15 @@
package location.nearby.proto;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "NearbyClientEnums";
option objc_class_prefix = "GNCP";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
// The user type that is logging.
enum UserType {
diff --git a/proto/nearby_event_codes.proto b/proto/nearby_event_codes.proto
index 7d0939e..80db57b 100644
--- a/proto/nearby_event_codes.proto
+++ b/proto/nearby_event_codes.proto
@@ -16,10 +16,14 @@
package location.nearby.proto;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "NearbyEventCodes";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
// Event codes for the NEARBY log source. See:
// http://google3/wireless/android/play/playlog/proto/event_code_enums.proto
diff --git a/proto/setup_enums.proto b/proto/setup_enums.proto
index 3906798..37b5c25 100644
--- a/proto/setup_enums.proto
+++ b/proto/setup_enums.proto
@@ -16,11 +16,15 @@
package location.nearby.proto.setup;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "SetupEnums";
option objc_class_prefix = "GNSP";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
// The type of event being logged.
// Lightweight START_* and STOP_* events track instances of potential crashes
diff --git a/proto/sharing_enums.proto b/proto/sharing_enums.proto
index f680316..0b8b58f 100644
--- a/proto/sharing_enums.proto
+++ b/proto/sharing_enums.proto
@@ -16,11 +16,15 @@
package location.nearby.proto.sharing;
+import "logs/proto/logs_annotations/logs_annotations.proto";
option optimize_for = LITE_RUNTIME;
+option (logs_proto.file_not_used_for_logging_except_enums) = true;
+option java_api_version = 2;
option java_package = "com.google.location.nearby.proto";
option java_outer_classname = "SharingEnums";
option objc_class_prefix = "GNSHP";
+option go_api_flag = "OPEN_TO_OPAQUE_HYBRID"; // See http://go/go-api-flag.
/*
We use event based logging (an event object can be constructed and logged
