Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1496)

Unified Diff: base/android/jni_generator/testInnerClassNativesMultiple.golden

Issue 2501193003: Selectively perform JNI registration in render processes on Android. (Closed)
Patch Set: Add @MainDex where it's missing Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/jni_generator/testInnerClassNativesMultiple.golden
diff --git a/base/android/jni_generator/testInnerClassNativesMultiple.golden b/base/android/jni_generator/testInnerClassNativesMultiple.golden
index 8f37c6876c9818cc52d1a352d9ebc8d6f18a88fa..0fc52c8a22a1374dfb1d929cfb369f562a64448a 100644
--- a/base/android/jni_generator/testInnerClassNativesMultiple.golden
+++ b/base/android/jni_generator/testInnerClassNativesMultiple.golden
@@ -15,6 +15,7 @@
#include "base/android/jni_generator/jni_generator_helper.h"
#include "base/android/jni_int_wrapper.h"
+#include "base/android/jni_utils.h"
// Step 1: forward declarations.
namespace {
@@ -76,6 +77,11 @@ static const JNINativeMethod kMethodsMyInnerClass[] = {
static bool RegisterNativesImpl(JNIEnv* env) {
if (base::android::IsManualJniRegistrationDisabled()) return true;
+ if (base::android::IsMultidexEnabled(env) &&
+ base::android::GetLibraryProcessType(env) !=
+ base::android::PROCESS_BROWSER) {
+ return true;
+ }
const int kMethodsMyOtherInnerClassSize =
arraysize(kMethodsMyOtherInnerClass);

Powered by Google App Engine
This is Rietveld 408576698