zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Move Java PeerConnectionFactory.fieldTrialsFindFullName to different file."

Browse Source 
This reverts commit d609473b9c51141a2bba691c2b90b84ba28fee89.

Reason for revert: Breaks downstream project

Original change's description:
> Move Java PeerConnectionFactory.fieldTrialsFindFullName to different file.
>
> Currently, Java equivalent of webrtc::field_trial::FindFullName is in
> PeeerConnectionFactory, which belongs to peerconnection_java GN target.
>
> Move that method into a separate file and GN target to make it easier
> to use the fieldTrialsFindFullName method in other code.
>
> Bug: webrtc:13973
> Change-Id: I4d7d30339883af76c1d066f72270c6caf9c64c49
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261500
> Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
> Commit-Queue: Xavier Lepaul‎ <xalep@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#37233}

Bug: webrtc:13973
Change-Id: I08eda44444aee4d64a0cee36f3f921f75088d7fc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265922
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37234}
This commit is contained in:
Artem Titov
2022-06-16 11:40:11 +00:00
committed by WebRTC LUCI CQ
parent d609473b9c
commit 091e073b63
5 changed files with 20 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sdk/android/src/jni/field_trial.cc
View File

@ -1,27 +0,0 @@
/*
* Copyright (c) 2022 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "system_wrappers/include/field_trial.h"
#include "sdk/android/generated_field_trial_jni/FieldTrial_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
namespace webrtc {
namespace jni {
static ScopedJavaLocalRef<jstring> JNI_FieldTrial_FindFieldTrialsFullName(
JNIEnv* jni,
const JavaParamRef<jstring>& j_name) {
return NativeToJavaString(
jni, field_trial::FindFullName(JavaToStdString(jni, j_name)));
}
} // namespace jni
} // namespace webrtc

8
sdk/android/src/jni/pc/peer_connection_factory.cc
View File

@ -213,6 +213,14 @@ static void JNI_PeerConnectionFactory_InitializeInternalTracer(JNIEnv* jni) {
rtc::tracing::SetupInternalTracer();
}
static ScopedJavaLocalRef<jstring>
JNI_PeerConnectionFactory_FindFieldTrialsFullName(
JNIEnv* jni,
const JavaParamRef<jstring>& j_name) {
return NativeToJavaString(
jni, field_trial::FindFullName(JavaToStdString(jni, j_name)));
}
static jboolean JNI_PeerConnectionFactory_StartInternalTracingCapture(
JNIEnv* jni,
const JavaParamRef<jstring>& j_event_tracing_filename) {