| Index: base/android/jni_generator/testMultipleJNIAdditionalImport.golden
|
| diff --git a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
|
| index dfeebc114e3ed3b575a2829dacfe7407aabaeb61..281a5e218f58020146013198bc5775604360f084 100644
|
| --- a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
|
| +++ b/base/android/jni_generator/testMultipleJNIAdditionalImport.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 {
|
| @@ -77,6 +78,11 @@ static const JNINativeMethod kMethodsFoo[] = {
|
|
|
| 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 kMethodsFooSize = arraysize(kMethodsFoo);
|
|
|
|
|