admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove RTC_JNI_GENERATOR_LEGACY_SYMBOLS.

Browse Source 
Bug: b/325408567
Change-Id: I4bd5fbe7cecdfd3fcce8da352ce30eeb0f5b6dd7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/356780
Reviewed-by: Zoé Lepaul <xalep@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#42615}
This commit is contained in:
Mirko Bonadei 2024-07-09 07:36:16 +00:00 committed by WebRTC LUCI CQ
parent 01cba58478
commit 9ebf0921ea
4 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -139,10 +139,6 @@ config("common_inherited_config") {
cflags = []
ldflags = []
if (rtc_jni_generator_legacy_symbols) {
defines += [ "RTC_JNI_GENERATOR_LEGACY_SYMBOLS" ]
}
if (rtc_objc_prefix != "") {
defines += [ "RTC_OBJC_TYPE_PREFIX=${rtc_objc_prefix}" ]
}

30
sdk/android/native_api/jni/java_types.cc
View File

@ -178,35 +178,19 @@ std::map<std::string, std::string> JavaToNativeStringMap(
}
ScopedJavaLocalRef<jobject> NativeToJavaBoolean(JNIEnv* env, bool b) {
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Boolean::Java_Boolean_ConstructorJLB_Z(env, b);
#else
return JNI_Boolean::Java_Boolean_Constructor__boolean(env, b);
#endif
}
ScopedJavaLocalRef<jobject> NativeToJavaDouble(JNIEnv* env, double d) {
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Double::Java_Double_ConstructorJLD_D(env, d);
#else
return JNI_Double::Java_Double_Constructor__double(env, d);
#endif
}
ScopedJavaLocalRef<jobject> NativeToJavaInteger(JNIEnv* jni, int32_t i) {
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Integer::Java_Integer_ConstructorJLI_I(jni, i);
#else
return JNI_Integer::Java_Integer_Constructor__int(jni, i);
#endif
}
ScopedJavaLocalRef<jobject> NativeToJavaLong(JNIEnv* env, int64_t u) {
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_Long::Java_Long_ConstructorJLLO_J(env, u);
#else
return JNI_Long::Java_Long_Constructor__long(env, u);
#endif
}
ScopedJavaLocalRef<jstring> NativeToJavaString(JNIEnv* env, const char* str) {
@ -340,33 +324,19 @@ ScopedJavaLocalRef<jobjectArray> NativeToJavaStringArray(
}
JavaListBuilder::JavaListBuilder(JNIEnv* env)
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
: env_(env),
j_list_(JNI_ArrayList::Java_ArrayList_ConstructorJUALI(env)) {}
#else
: env_(env), j_list_(JNI_ArrayList::Java_ArrayList_Constructor(env)) {
}
#endif
JavaListBuilder::~JavaListBuilder() = default;
void JavaListBuilder::add(const JavaRef<jobject>& element) {
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
JNI_ArrayList::Java_ArrayList_addZ_JUE(env_, j_list_, element);
#else
JNI_ArrayList::Java_ArrayList_add(env_, j_list_, element);
#endif
}
JavaMapBuilder::JavaMapBuilder(JNIEnv* env)
: env_(env),
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
j_map_(JNI_LinkedHashMap::Java_LinkedHashMap_ConstructorJULIHM(env)) {
}
#else
j_map_(JNI_LinkedHashMap::Java_LinkedHashMap_Constructor(env)) {
}
#endif
JavaMapBuilder::~JavaMapBuilder() = default;

5
sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
View File

@ -26,13 +26,8 @@ namespace jni {
namespace {
ScopedJavaLocalRef<jobject> NativeToJavaBigInteger(JNIEnv* env, uint64_t u) {
#ifdef RTC_JNI_GENERATOR_LEGACY_SYMBOLS
return JNI_BigInteger::Java_BigInteger_ConstructorJMBI_JLS(
env, NativeToJavaString(env, rtc::ToString(u)));
#else
return JNI_BigInteger::Java_BigInteger_Constructor__String(
env, NativeToJavaString(env, rtc::ToString(u)));
#endif
}
ScopedJavaLocalRef<jobjectArray> NativeToJavaBigIntegerArray(

4
webrtc.gni
View File

@ -53,10 +53,6 @@ declare_args() {
}
declare_args() {
# If set to true, C++ code will refer to the new JNI Generator symbols.
# If set to false the old ones will be used (to provide a nice update path).
rtc_jni_generator_legacy_symbols = false
# Setting this to true, will make RTC_DLOG() expand to log statements instead
# of being removed by the preprocessor.
# This is useful for example to be able to get RTC_DLOGs on a release build.