TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update presence build rules and copybara export to OSS

Browse Source 
- updates the build to be compatible with ldt in the open source repo

PiperOrigin-RevId: 627415836
This commit is contained in:
hai007
2024-04-23 09:40:55 -07:00
committed by Copybara-Service
parent d5b75beaee
commit 1c4bd01fe6
6 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.bazelrc
+1 -2
View File
@@ -1,4 +1,3 @@
build --action_env=BAZEL_CXXOPTS=-std=c++17
# Definition of --config=memcheck
build:memcheck --strip=never --test_timeout=3600
build --sandbox_block_path=/usr/local
build:memcheck --strip=never --test_timeout=3600
presence/implementation/BUILD
+3 -3
View File
@@ -156,11 +156,11 @@ cc_library(
] + select({
":norust_or_windows_or_android": [":ldt_stub"],
":use_rust_decoder": [
"//third_party/beto_core/nearby/presence/ldt_np_adv_ffi",
"//third_party/beto_core/nearby/presence/np_c_ffi:np_c_ffi_types",
"//third_party/beto_core/nearby/presence/np_cpp_ffi",
"@beto-core//:ldt_np_adv_ffi",
"@beto-core//:np_cpp_ffi",
],
"//conditions:default": ["//third_party/beto_core/nearby/presence/ldt_np_adv_ffi"],
"//conditions:default": ["@beto-core//:ldt_np_adv_ffi"],
}),
)
presence/implementation/advertisement_decoder_rust_impl.cc
+2 -2
View File
@@ -28,8 +28,8 @@
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#include "third_party/beto-core/src/nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h"
#include "third_party/beto-core/src/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
#include "third_party/beto_core/nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h"
#include "third_party/beto_core/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
#include "internal/proto/credential.proto.h"
#include "presence/data_element.h"
#include "presence/implementation/action_factory.h"
presence/implementation/advertisement_decoder_rust_impl.h
+1 -2
View File
@@ -21,8 +21,7 @@
#include "absl/container/flat_hash_map.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "third_party/beto-core/src/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
#include "internal/proto/credential.pb.h"
#include "third_party/beto_core/nearby/presence/np_cpp_ffi/include/nearby_protocol.h"
#include "presence/implementation/advertisement_decoder.h"
namespace nearby {
presence/implementation/ldt.cc
+4 -3
View File
@@ -15,15 +15,16 @@
#include "presence/implementation/ldt.h"
#include <algorithm>
#include <optional>
#include <cstdint>
#include <string>
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#ifdef USE_RUST_LDT
#include "third_party/beto-core/src/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
#if defined(USE_RUST_LDT) || defined(USE_RUST_DECODER)
#include "third_party/beto_core/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
#else
#include "presence/implementation/np_ldt.h"
#endif /* USE_RUST_LDT */
presence/implementation/ldt.h
+2 -2
View File
@@ -20,8 +20,8 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#ifdef USE_RUST_LDT
#include "third_party/beto-core/src/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
#if defined(USE_RUST_LDT) || defined(USE_RUST_DECODER)
#include "third_party/beto_core/nearby/presence/ldt_np_adv_ffi/c/include/np_ldt.h"
#else
#include "presence/implementation/np_ldt.h"
#endif /* USE_RUST_LDT */