android: Realign stack pointer on JNI entry.

base/android/jni_generator/testNatives.golden

Index: base/android/jni_generator/testNatives.golden
diff --git a/base/android/jni_generator/testNatives.golden b/base/android/jni_generator/testNatives.golden
index e2f64cd90121506a475205efd654049a73705126..319e493ac9841abb07fdae57b1a615e7c61ca7d7 100644
--- a/base/android/jni_generator/testNatives.golden
+++ b/base/android/jni_generator/testNatives.golden
@@ -31,11 +31,17 @@ static jint Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     jcaller);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jint Java_org_chromium_TestJni_nativeInit(JNIEnv* env, jobject jcaller) {
   return Init(env, base::android::JavaParamRef<jobject>(env, jcaller));
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider) {
@@ -47,6 +53,9 @@ void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -67,6 +76,9 @@ static base::android::ScopedJavaLocalRef<jstring> GetDomainAndRegistry(JNIEnv*
     const base::android::JavaParamRef<jstring>& url);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jstring Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env, jclass
     jcaller,
     jstring url) {
@@ -80,6 +92,9 @@ static void CreateHistoricalTabFromState(JNIEnv* env, const
     jint tab_index);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv* env,
     jclass jcaller,
     jbyteArray state,
@@ -94,6 +109,9 @@ static base::android::ScopedJavaLocalRef<jbyteArray> GetStateAsByteArray(JNIEnv*
     const base::android::JavaParamRef<jobject>& view);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jbyteArray Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv* env,
     jobject jcaller,
     jobject view) {
@@ -106,6 +124,9 @@ static base::android::ScopedJavaLocalRef<jobjectArray>
     base::android::JavaParamRef<jclass>& jcaller);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jobjectArray Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv*
     env, jclass jcaller) {
   return GetAutofillProfileGUIDs(env, base::android::JavaParamRef<jclass>(env,
@@ -118,6 +139,9 @@ static void SetRecognitionResults(JNIEnv* env, const
     const base::android::JavaParamRef<jobjectArray>& results);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env, jobject
     jcaller,
     jint sessionId,
@@ -128,6 +152,9 @@ void Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env, jobject
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jlong Java_org_chromium_TestJni_nativeAddBookmarkFromAPI(JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -157,6 +184,9 @@ static jint FindAll(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     const base::android::JavaParamRef<jstring>& find);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject jcaller,
     jstring find) {
   return FindAll(env, base::android::JavaParamRef<jobject>(env, jcaller),
@@ -167,6 +197,9 @@ static base::android::ScopedJavaLocalRef<jobject> GetInnerClass(JNIEnv* env,
     const base::android::JavaParamRef<jclass>& jcaller);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass
     jcaller) {
   return GetInnerClass(env, base::android::JavaParamRef<jclass>(env,
@@ -174,6 +207,9 @@ jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -192,6 +228,9 @@ jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void Java_org_chromium_TestJni_nativeGotOrientation(JNIEnv* env,
     jobject jcaller,
     jint nativeDataFetcherImplAndroid,
@@ -211,6 +250,9 @@ static base::android::ScopedJavaLocalRef<jthrowable>
     const base::android::JavaParamRef<jthrowable>& e);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jthrowable Java_org_chromium_TestJni_nativeMessWithJavaException(JNIEnv* env,
     jclass jcaller,
     jthrowable e) {