From f7706aecdc1f5b0b138a313fa17c80c84bf26ea0 Mon Sep 17 00:00:00 2001 From: siddhartha sivakumar Date: Tue, 27 Feb 2018 00:52:54 +0000 Subject: [PATCH] Revert "Forward fix jni_generator_helper.h." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 63e83c77ae81730a78ec4d5bf0465f25970f867a. Reason for revert: JNI generator is not using the heap profiler anymore. Original change's description: > Forward fix jni_generator_helper.h. > > 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} TBR=mbonadei@webrtc.org,magjed@webrtc.org,sakal@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:801260 Change-Id: I7dac211b89d8206dc461af0a17b6d53cc8661b2a Reviewed-on: https://webrtc-review.googlesource.com/58040 Commit-Queue: Mirko Bonadei Reviewed-by: Magnus Jedvert Reviewed-by: Sami Kalliomäki Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#22206} --- sdk/android/src/jni/jni_generator_helper.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk/android/src/jni/jni_generator_helper.h b/sdk/android/src/jni/jni_generator_helper.h index 98ced609a2..f64f1ca9df 100644 --- a/sdk/android/src/jni/jni_generator_helper.h +++ b/sdk/android/src/jni/jni_generator_helper.h @@ -21,10 +21,6 @@ #include "rtc_base/checks.h" #include "sdk/android/native_api/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;