Commit 38f45b92 authored by Jeremy Leconte's avatar Jeremy Leconte Committed by Commit Bot

Fix WebRTC JNI error when rolling Chromium.

With the landing of crrev.com/c/2364635, WebRTC has the below compile error when rolling chromium.
ci.chromium.org/p/webrtc/builders/try/android_arm64_rel/40012
'base::android::JNI_TraceEvent_StartATrace' has internal linkage but is not defined
'base::android::JNI_TraceEvent_SetupATraceStartupTrace' has internal linkage but is not defined

The error doesn't occur for functions like JNI_TraceEvent_BeginToplevel hence the proposed fix.

Bug: 1095587
Change-Id: Iaf2cc152883ff7b991ce0567577bf937e634d2de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2370622
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801071}
parent 4494aae0
...@@ -77,11 +77,11 @@ static void JNI_TraceEvent_RegisterEnabledObserver(JNIEnv* env) { ...@@ -77,11 +77,11 @@ static void JNI_TraceEvent_RegisterEnabledObserver(JNIEnv* env) {
base::android::Java_TraceEvent_setEnabled(env, false); base::android::Java_TraceEvent_setEnabled(env, false);
} }
static void JNI_TraceEvent_StartATrace(JNIEnv* env, static void JNI_TraceEvent_StartATrace(JNIEnv* env,
base::android::JavaParamRef<jstring>&) {} const JavaParamRef<jstring>&) {}
static void JNI_TraceEvent_StopATrace(JNIEnv* env) {} static void JNI_TraceEvent_StopATrace(JNIEnv* env) {}
static void JNI_TraceEvent_SetupATraceStartupTrace( static void JNI_TraceEvent_SetupATraceStartupTrace(
JNIEnv* env, JNIEnv* env,
base::android::JavaParamRef<jstring>&) {} const JavaParamRef<jstring>&) {}
#endif // BUILDFLAG(ENABLE_BASE_TRACING) #endif // BUILDFLAG(ENABLE_BASE_TRACING)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment