From 31ae3e7c8104682836506ca8b5dc5aed42ebe16a Mon Sep 17 00:00:00 2001 From: Jim Chen Date: Wed, 29 Jul 2015 15:11:14 -0400 Subject: [PATCH] Bug 1182641 - Use new autogenerated native methods for ANRReporter; r=snorp --- mobile/android/base/ANRReporter.java | 4 ++++ mobile/android/base/Makefile.in | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/ANRReporter.java b/mobile/android/base/ANRReporter.java index 12f3b178b9e..91753602122 100644 --- a/mobile/android/base/ANRReporter.java +++ b/mobile/android/base/ANRReporter.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; import org.json.JSONObject; import org.mozilla.gecko.AppConstants.Versions; +import org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI; import org.mozilla.gecko.util.ThreadUtils; import android.content.BroadcastReceiver; @@ -53,8 +54,11 @@ public final class ANRReporter extends BroadcastReceiver private Handler mHandler; private volatile boolean mPendingANR; + @WrapElementForJNI private static native boolean requestNativeStack(boolean unwind); + @WrapElementForJNI private static native String getNativeStack(); + @WrapElementForJNI private static native void releaseNativeStack(); public static void register(Context context) { diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index c2d6e2a2e9d..2bdec5aca42 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -195,7 +195,6 @@ classycle_jar := $(topsrcdir)/mobile/android/build/classycle/classycle-1.4.1.jar -libraryjars $(library_jars) CLASSES_WITH_JNI= \ - org.mozilla.gecko.ANRReporter \ org.mozilla.gecko.GeckoAppShell \ org.mozilla.gecko.GeckoJavaSampler \ org.mozilla.gecko.gfx.NativePanZoomController \