From 63e83c77ae81730a78ec4d5bf0465f25970f867a Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 23 Jan 2018 10:38:51 +0100 Subject: [PATCH] Forward fix jni_generator_helper.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#21730} --- sdk/android/src/jni/jni_generator_helper.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/android/src/jni/jni_generator_helper.h b/sdk/android/src/jni/jni_generator_helper.h index 6f2cad25cb..901ffb6cef 100644 --- a/sdk/android/src/jni/jni_generator_helper.h +++ b/sdk/android/src/jni/jni_generator_helper.h @@ -21,6 +21,10 @@ #include "rtc_base/checks.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_NATIVE_PTR(env, jcaller, native_ptr, method_name, ...) \ RTC_DCHECK(native_ptr) << method_name;