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

Unified Diff: base/android/jni_generator/SampleForTests_jni.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/SampleForTests_jni.golden
diff --git a/base/android/jni_generator/SampleForTests_jni.golden b/base/android/jni_generator/SampleForTests_jni.golden
index 6fdced269c4ebab07b8679d5ba12b7e2ecb2c2aa..8306bae1d784f533193af5a0c065e4a81d937665 100644
--- a/base/android/jni_generator/SampleForTests_jni.golden
+++ b/base/android/jni_generator/SampleForTests_jni.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 {
@@ -484,6 +485,11 @@ static const JNINativeMethod kMethodsSampleForTests[] = {
static bool RegisterNativesImpl(JNIEnv* env) {
if (base::android::IsManualJniRegistrationDisabled()) return true;
+ if (base::android::IsMultidexEnabled(env) &&
agrieve 2016/12/07 20:46:19 This logic should hold whether or not multidex is
estevenson 2016/12/07 23:00:04 Done.
+ base::android::GetLibraryProcessType(env) !=
+ base::android::PROCESS_BROWSER) {
+ return true;
+ }
const int kMethodsInnerClassSize = arraysize(kMethodsInnerClass);

Powered by Google App Engine
This is Rietveld 408576698