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..2399cd7e60ed29a66d9ab358df00b87584b7a062 100644
--- a/base/android/jni_generator/testNatives.golden
+++ b/base/android/jni_generator/testNatives.golden
@@ -30,13 +30,12 @@ base::subtle::AtomicWord g_TestJni_clazz __attribute__((unused)) = 0;
 static jint Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     jcaller);
 
-extern "C" __attribute__((visibility("default")))
-jint Java_org_chromium_TestJni_nativeInit(JNIEnv* env, jobject jcaller) {
+JNI_GENERATOR_EXPORT jint Java_org_chromium_TestJni_nativeInit(JNIEnv* env,
+    jobject jcaller) {
   return Init(env, base::android::JavaParamRef<jobject>(env, jcaller));
 }
 
-extern "C" __attribute__((visibility("default")))
-void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
+JNI_GENERATOR_EXPORT void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider) {
   ChromeBrowserProvider* native =
@@ -46,9 +45,8 @@ void Java_org_chromium_TestJni_nativeDestroy(JNIEnv* env,
       jcaller));
 }
 
-extern "C" __attribute__((visibility("default")))
-jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv* env,
-    jobject jcaller,
+JNI_GENERATOR_EXPORT jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv*
+    env, jobject jcaller,
     jint nativeChromeBrowserProvider,
     jstring url,
     jstring title,
@@ -66,8 +64,8 @@ static base::android::ScopedJavaLocalRef<jstring> GetDomainAndRegistry(JNIEnv*
     env, const base::android::JavaParamRef<jclass>& jcaller,
     const base::android::JavaParamRef<jstring>& url);
 
-extern "C" __attribute__((visibility("default")))
-jstring Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env, jclass
+JNI_GENERATOR_EXPORT jstring
+    Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env, jclass
     jcaller,
     jstring url) {
   return GetDomainAndRegistry(env, base::android::JavaParamRef<jclass>(env,
@@ -79,8 +77,8 @@ static void CreateHistoricalTabFromState(JNIEnv* env, const
     const base::android::JavaParamRef<jbyteArray>& state,
     jint tab_index);
 
-extern "C" __attribute__((visibility("default")))
-void Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv* env,
+JNI_GENERATOR_EXPORT void
+    Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv* env,
     jclass jcaller,
     jbyteArray state,
     jint tab_index) {
@@ -93,9 +91,9 @@ static base::android::ScopedJavaLocalRef<jbyteArray> GetStateAsByteArray(JNIEnv*
     env, const base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jobject>& view);
 
-extern "C" __attribute__((visibility("default")))
-jbyteArray Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv* env,
-    jobject jcaller,
+JNI_GENERATOR_EXPORT jbyteArray
+    Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv* env, jobject
+    jcaller,
     jobject view) {
   return GetStateAsByteArray(env, base::android::JavaParamRef<jobject>(env,
       jcaller), base::android::JavaParamRef<jobject>(env, view)).Release();
@@ -105,9 +103,9 @@ static base::android::ScopedJavaLocalRef<jobjectArray>
     GetAutofillProfileGUIDs(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& jcaller);
 
-extern "C" __attribute__((visibility("default")))
-jobjectArray Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv*
-    env, jclass jcaller) {
+JNI_GENERATOR_EXPORT jobjectArray
+    Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass
+    jcaller) {
   return GetAutofillProfileGUIDs(env, base::android::JavaParamRef<jclass>(env,
       jcaller)).Release();
 }
@@ -117,8 +115,8 @@ static void SetRecognitionResults(JNIEnv* env, const
     jint sessionId,
     const base::android::JavaParamRef<jobjectArray>& results);
 
-extern "C" __attribute__((visibility("default")))
-void Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env, jobject
+JNI_GENERATOR_EXPORT void
+    Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env, jobject
     jcaller,
     jint sessionId,
     jobjectArray results) {
@@ -127,9 +125,9 @@ void Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env, jobject
       results));
 }
 
-extern "C" __attribute__((visibility("default")))
-jlong Java_org_chromium_TestJni_nativeAddBookmarkFromAPI(JNIEnv* env,
-    jobject jcaller,
+JNI_GENERATOR_EXPORT jlong
+    Java_org_chromium_TestJni_nativeAddBookmarkFromAPI(JNIEnv* env, jobject
+    jcaller,
     jint nativeChromeBrowserProvider,
     jstring url,
     jobject created,
@@ -156,8 +154,8 @@ static jint FindAll(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     jcaller,
     const base::android::JavaParamRef<jstring>& find);
 
-extern "C" __attribute__((visibility("default")))
-jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject jcaller,
+JNI_GENERATOR_EXPORT jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env,
+    jobject jcaller,
     jstring find) {
   return FindAll(env, base::android::JavaParamRef<jobject>(env, jcaller),
       base::android::JavaParamRef<jstring>(env, find));
@@ -166,16 +164,14 @@ jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject jcaller,
 static base::android::ScopedJavaLocalRef<jobject> GetInnerClass(JNIEnv* env,
     const base::android::JavaParamRef<jclass>& jcaller);
 
-extern "C" __attribute__((visibility("default")))
-jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass
-    jcaller) {
+JNI_GENERATOR_EXPORT jobject
+    Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass jcaller) {
   return GetInnerClass(env, base::android::JavaParamRef<jclass>(env,
       jcaller)).Release();
 }
 
-extern "C" __attribute__((visibility("default")))
-jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
-    jobject jcaller,
+JNI_GENERATOR_EXPORT jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv*
+    env, jobject jcaller,
     jint nativeChromeBrowserProvider,
     jobjectArray projection,
     jstring selection,
@@ -191,9 +187,8 @@ jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
       base::android::JavaParamRef<jstring>(env, sortOrder)).Release();
 }
 
-extern "C" __attribute__((visibility("default")))
-void Java_org_chromium_TestJni_nativeGotOrientation(JNIEnv* env,
-    jobject jcaller,
+JNI_GENERATOR_EXPORT void Java_org_chromium_TestJni_nativeGotOrientation(JNIEnv*
+    env, jobject jcaller,
     jint nativeDataFetcherImplAndroid,
     jdouble alpha,
     jdouble beta,
@@ -210,9 +205,9 @@ static base::android::ScopedJavaLocalRef<jthrowable>
     base::android::JavaParamRef<jclass>& jcaller,
     const base::android::JavaParamRef<jthrowable>& e);
 
-extern "C" __attribute__((visibility("default")))
-jthrowable Java_org_chromium_TestJni_nativeMessWithJavaException(JNIEnv* env,
-    jclass jcaller,
+JNI_GENERATOR_EXPORT jthrowable
+    Java_org_chromium_TestJni_nativeMessWithJavaException(JNIEnv* env, jclass
+    jcaller,
     jthrowable e) {
   return MessWithJavaException(env, base::android::JavaParamRef<jclass>(env,
       jcaller), base::android::JavaParamRef<jthrowable>(env, e)).Release();