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

Internal Change

Browse Source 
PiperOrigin-RevId: 520165614
This commit is contained in:
Nick Bourdakos
2023-03-28 16:26:40 -07:00
committed by Copybara-Service
parent ec0944a61b
commit a933a91413
19 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/c/BUILD
-1
View File
@@ -107,7 +107,6 @@ lexan.cc_windows_dll(
":c",
":types",
"//internal/platform/implementation/windows",
"//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory",
"@com_google_absl//absl/strings",
],
)
connections/dart/BUILD
-1
View File
@@ -35,7 +35,6 @@ lexan.cc_windows_dll(
"//internal/flags:nearby_flags",
"//internal/platform/implementation/windows",
"//third_party/dart_lang/v2:dart_api_dl",
"//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory",
],
)
connections/implementation/BUILD
+1
View File
@@ -134,6 +134,7 @@ cc_library(
"//connections/implementation/flags:connections_flags",
"//connections/implementation/mediums",
"//connections/implementation/mediums:utils",
"//connections/implementation/mediums/webrtc",
"//connections/implementation/proto:offline_wire_formats_cc_proto",
"//internal:device",
"//internal/analytics:event_logger",
connections/implementation/base_pcp_handler.h
-4
View File
@@ -31,10 +31,6 @@
#include "connections/implementation/endpoint_channel_manager.h"
#include "connections/implementation/endpoint_manager.h"
#include "connections/implementation/mediums/mediums.h"
#ifdef NO_WEBRTC
#include "connections/implementation/mediums/webrtc_stub.h"
#else
#endif
#include "connections/implementation/pcp.h"
#include "connections/implementation/pcp_handler.h"
#include "connections/listeners.h"
connections/implementation/mediums/BUILD
+6 -3
View File
@@ -56,6 +56,8 @@ cc_library(
"@com_google_absl//absl/types:optional",
"//connections:core_types",
"//connections/implementation/mediums/ble_v2",
"//connections/implementation/mediums/webrtc",
"//connections/implementation/proto:offline_wire_formats_cc_proto",
"//internal/platform:base",
"//internal/platform:cancellation_flag",
"//internal/platform:comm",
@@ -64,10 +66,10 @@ cc_library(
"//internal/platform:uuid",
"//proto/mediums:web_rtc_signaling_frames_cc_proto",
] + select({
"@platforms//cpu:arm": [
"//connections/implementation/proto:offline_wire_formats_cc_proto",
"@platforms//cpu:arm": [],
"//conditions:default": [
# TODO: Support WebRTC
],
"//conditions:default": [],
}),
)
@@ -93,6 +95,7 @@ cc_library(
"//connections/implementation/mediums/webrtc:__pkg__",
],
deps = [
"//connections/implementation/mediums/webrtc:data_types",
"//connections/implementation/proto:offline_wire_formats_cc_proto",
"//internal/platform:base",
"//internal/platform:types",
connections/implementation/mediums/webrtc/BUILD
+2 -3
View File
@@ -44,8 +44,7 @@ cc_library(
] + select({
"@platforms//cpu:arm": [],
"//conditions:default": [
"//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
"//third_party/webrtc/files/stable/webrtc/pc:peerconnection",
# TODO: Support WebRTC
],
}),
)
@@ -69,7 +68,7 @@ cc_library(
] + select({
"@platforms//cpu:arm": [],
"//conditions:default": [
"//third_party/webrtc/files/stable/webrtc/api:libjingle_peerconnection_api",
# TODO: Support WebRTC
],
}),
)
connections/implementation/mediums/webrtc/connection_flow.cc
+4
View File
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef NO_WEBRTC
#include "connections/implementation/mediums/webrtc/connection_flow.h"
#include <iterator>
@@ -558,3 +560,5 @@ ConnectionFlow::GetAndResetPeerConnection() {
} // namespace mediums
} // namespace connections
} // namespace nearby
#endif
connections/implementation/mediums/webrtc/connection_flow.h
+4
View File
@@ -15,6 +15,8 @@
#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
#define CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
#ifndef NO_WEBRTC
#include <memory>
#include "connections/implementation/mediums/webrtc/data_channel_listener.h"
@@ -228,4 +230,6 @@ class ConnectionFlow : public webrtc::PeerConnectionObserver {
} // namespace connections
} // namespace nearby
#endif
#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_CONNECTION_FLOW_H_
connections/implementation/mediums/webrtc/data_channel_listener.h
+4
View File
@@ -15,6 +15,8 @@
#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
#define CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
#ifndef NO_WEBRTC
#include "connections/implementation/mediums/webrtc_socket.h"
#include "connections/listeners.h"
#include "internal/platform/byte_array.h"
@@ -38,4 +40,6 @@ struct DataChannelListener {
} // namespace connections
} // namespace nearby
#endif
#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_DATA_CHANNEL_LISTENER_H_
connections/implementation/mediums/webrtc/local_ice_candidate_listener.h
+4
View File
@@ -15,6 +15,8 @@
#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
#define CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
#ifndef NO_WEBRTC
#include "connections/listeners.h"
#include "webrtc/api/peer_connection_interface.h"
@@ -34,4 +36,6 @@ struct LocalIceCandidateListener {
} // namespace connections
} // namespace nearby
#endif
#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_LOCAL_ICE_CANDIDATE_LISTENER_H_
connections/implementation/mediums/webrtc/session_description_wrapper.h
+4
View File
@@ -15,6 +15,8 @@
#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
#define CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
#ifndef NO_WEBRTC
#include "webrtc/api/peer_connection_interface.h"
// Wrapper object around SessionDescriptionInterface*.
@@ -61,4 +63,6 @@ class SessionDescriptionWrapper {
std::unique_ptr<webrtc::SessionDescriptionInterface> impl_;
};
#endif
#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_SESSION_DESCRIPTION_WRAPPER_H_
connections/implementation/mediums/webrtc/signaling_frames.cc
+5 -1
View File
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef NO_WEBRTC
#include "connections/implementation/mediums/webrtc/signaling_frames.h"
namespace nearby {
@@ -129,4 +131,6 @@ location::nearby::mediums::IceCandidate EncodeIceCandidate(
} // namespace webrtc_frames
} // namespace mediums
} // namespace connections
} // namespace nearby
} // namespace nearby
#endif
connections/implementation/mediums/webrtc/signaling_frames.h
+4
View File
@@ -15,6 +15,8 @@
#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
#define CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
#ifndef NO_WEBRTC
#include <vector>
#include "connections/implementation/mediums/webrtc_peer_id.h"
@@ -53,4 +55,6 @@ std::vector<std::unique_ptr<webrtc::IceCandidateInterface>> DecodeIceCandidates(
} // namespace connections
} // namespace nearby
#endif
#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_SIGNALING_FRAMES_H_
connections/implementation/mediums/webrtc/webrtc_socket_impl.cc
+4
View File
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef NO_WEBRTC
#include "connections/implementation/mediums/webrtc/webrtc_socket_impl.h"
#include "internal/platform/logging.h"
@@ -186,3 +188,5 @@ void WebRtcSocket::OffloadFromSignalingThread(Runnable runnable) {
} // namespace mediums
} // namespace connections
} // namespace nearby
#endif
connections/implementation/mediums/webrtc/webrtc_socket_impl.h
+4
View File
@@ -15,6 +15,8 @@
#ifndef CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_IMPL_H_
#define CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_IMPL_H_
#ifndef NO_WEBRTC
#include <memory>
#include "connections/listeners.h"
@@ -118,4 +120,6 @@ class WebRtcSocket : public Socket, public webrtc::DataChannelObserver {
} // namespace connections
} // namespace nearby
#endif
#endif // CORE_INTERNAL_MEDIUMS_WEBRTC_WEBRTC_SOCKET_IMPL_H_
internal/platform/BUILD
+8 -3
View File
@@ -405,14 +405,19 @@ cc_library(
":logging",
":types",
":uuid",
"//internal/platform/implementation:comm",
"//internal/platform/implementation:platform",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/functional:any_invocable",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:optional",
],
"//internal/platform/implementation:comm",
"//internal/platform/implementation:platform",
] + select({
"@platforms//cpu:arm": [],
"//conditions:default": [
# TODO: Support WebRTC
],
}),
)
cc_test(
internal/platform/implementation/BUILD
+12 -7
View File
@@ -82,19 +82,24 @@ cc_library(
"//presence/implementation:__subpackages__",
],
deps = [
"//connections/implementation/proto:offline_wire_formats_cc_proto",
"//internal/platform:base",
"//internal/platform:cancellation_flag",
"//internal/platform:uuid",
"//internal/proto:credential_cc_proto",
"//internal/proto:local_credential_cc_proto",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/functional:any_invocable",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
],
"//connections/implementation/proto:offline_wire_formats_cc_proto",
"//internal/platform:base",
"//internal/platform:cancellation_flag",
"//internal/platform:uuid",
"//internal/proto:credential_cc_proto",
"//internal/proto:local_credential_cc_proto",
] + select({
"@platforms//cpu:arm": [],
"//conditions:default": [
# TODO: Support WebRTC
],
}),
)
cc_library(
internal/platform/implementation/g3/BUILD
+3
View File
@@ -89,6 +89,9 @@ cc_library(
"//internal/platform/implementation:comm",
"//internal/platform/implementation/shared:count_down_latch",
"//internal/proto:credential_cc_proto",
"//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",
"//third_party/webrtc/files/stable/webrtc/rtc_base:checks",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/container:flat_hash_map",
internal/platform/webrtc.h
+4
View File
@@ -15,6 +15,8 @@
#ifndef PLATFORM_PUBLIC_WEBRTC_H_
#define PLATFORM_PUBLIC_WEBRTC_H_
#ifndef NO_WEBRTC
#include <memory>
#include "internal/platform/implementation/platform.h"
@@ -94,4 +96,6 @@ class WebRtcMedium final {
} // namespace nearby
#endif
#endif // PLATFORM_PUBLIC_WEBRTC_H_