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); |