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

Forward fix jni_generator_helper.h.

Browse Source 
In crrev.com/531028, the JNI generator starts to add heap profiler
events to JNI generated functions.

This will cause a ~80KiB regression and at the moment it is breaking
the Chromium Roll into WebRTC.

This CL defines a void macro to re-enable the Chromium Roll avoiding
the size regression.

Bug: chromium:801260
Change-Id: I9543299199c4e14b6b9b235c5cb98c0d53cf29ea
Reviewed-on: https://webrtc-review.googlesource.com/43021
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21730}
This commit is contained in:
Mirko Bonadei
2018-01-23 10:38:51 +01:00
committed by Commit Bot
parent db9e9d5486
commit 63e83c77ae
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/android/src/jni/jni_generator_helper.h
View File

@ -21,6 +21,10 @@
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "sdk/android/src/jni/scoped_java_ref.h" #include "sdk/android/src/jni/scoped_java_ref.h"
// TODO(crbug.com/801260): Remove this macro definition as soon as
// crrev.com/531028 will be reverted.
#define TRACE_NATIVE_EXECUTION_SCOPED(name)
#define CHECK_CLAZZ(env, jcaller, clazz, ...) RTC_DCHECK(clazz); #define CHECK_CLAZZ(env, jcaller, clazz, ...) RTC_DCHECK(clazz);
#define CHECK_NATIVE_PTR(env, jcaller, native_ptr, method_name, ...) \ #define CHECK_NATIVE_PTR(env, jcaller, native_ptr, method_name, ...) \
RTC_DCHECK(native_ptr) << method_name; RTC_DCHECK(native_ptr) << method_name;