android: Realign stack pointer on JNI entry.

base/android/jni_generator/SampleForTests_jni.golden

Index: base/android/jni_generator/SampleForTests_jni.golden
diff --git a/base/android/jni_generator/golden_sample_for_tests_jni.h b/base/android/jni_generator/SampleForTests_jni.golden
similarity index 94%
rename from base/android/jni_generator/golden_sample_for_tests_jni.h
rename to base/android/jni_generator/SampleForTests_jni.golden
index 56bf770352d862b021debe77b96e413ac953121c..b213ead469c086d64c8a598e4bff515253c0f9da 100644
--- a/base/android/jni_generator/golden_sample_for_tests_jni.h
+++ b/base/android/jni_generator/SampleForTests_jni.golden
@@ -50,19 +50,17 @@ static jlong Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     jcaller,
     const base::android::JavaParamRef<jstring>& param);
 
-extern "C" __attribute__((visibility("default")))
-jlong Java_org_chromium_example_jni_1generator_SampleForTests_nativeInit(JNIEnv*
+JNI_GENERATOR_EXPORT jlong
+    Java_org_chromium_example_jni_1generator_SampleForTests_nativeInit(JNIEnv*
     env, jobject jcaller,
     jstring param) {
   return Init(env, base::android::JavaParamRef<jobject>(env, jcaller),
       base::android::JavaParamRef<jstring>(env, param));
 }
 
-extern "C" __attribute__((visibility("default")))
-void
+JNI_GENERATOR_EXPORT void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeDestroy(JNIEnv*
-    env,
-    jobject jcaller,
+    env, jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "Destroy");
@@ -73,8 +71,7 @@ void
 static jdouble GetDoubleFunction(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller);
 
-extern "C" __attribute__((visibility("default")))
-jdouble
+JNI_GENERATOR_EXPORT jdouble
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetDoubleFunction(JNIEnv*
     env, jobject jcaller) {
   return GetDoubleFunction(env, base::android::JavaParamRef<jobject>(env,
@@ -84,8 +81,7 @@ jdouble
 static jfloat GetFloatFunction(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& jcaller);
 
-extern "C" __attribute__((visibility("default")))
-jfloat
+JNI_GENERATOR_EXPORT jfloat
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetFloatFunction(JNIEnv*
     env, jclass jcaller) {
   return GetFloatFunction(env, base::android::JavaParamRef<jclass>(env,
@@ -96,8 +92,7 @@ static void SetNonPODDatatype(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jobject>& rect);
 
-extern "C" __attribute__((visibility("default")))
-void
+JNI_GENERATOR_EXPORT void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeSetNonPODDatatype(JNIEnv*
     env, jobject jcaller,
     jobject rect) {
@@ -108,19 +103,16 @@ void
 static base::android::ScopedJavaLocalRef<jobject> GetNonPODDatatype(JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller);
 
-extern "C" __attribute__((visibility("default")))
-jobject
+JNI_GENERATOR_EXPORT jobject
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetNonPODDatatype(JNIEnv*
     env, jobject jcaller) {
   return GetNonPODDatatype(env, base::android::JavaParamRef<jobject>(env,
       jcaller)).Release();
 }
 
-extern "C" __attribute__((visibility("default")))
-jint
+JNI_GENERATOR_EXPORT jint
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethod(JNIEnv*
-    env,
-    jobject jcaller,
+    env, jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
@@ -128,11 +120,9 @@ jint
       jcaller));
 }
 
-extern "C" __attribute__((visibility("default")))
-jdouble
+JNI_GENERATOR_EXPORT jdouble
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethodOtherP0(JNIEnv*
-    env,
-    jobject jcaller,
+    env, jobject jcaller,
     jlong nativePtr) {
   CPPClass::InnerClass* native =
       reinterpret_cast<CPPClass::InnerClass*>(nativePtr);
@@ -141,11 +131,9 @@ jdouble
       jcaller));
 }
 
-extern "C" __attribute__((visibility("default")))
-void
+JNI_GENERATOR_EXPORT void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeAddStructB(JNIEnv*
-    env,
-    jobject jcaller,
+    env, jobject jcaller,
     jlong nativeCPPClass,
     jobject b) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
@@ -154,11 +142,9 @@ void
       jcaller), base::android::JavaParamRef<jobject>(env, b));
 }
 
-extern "C" __attribute__((visibility("default")))
-void
+JNI_GENERATOR_EXPORT void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeIterateAndDoSomethingWithStructB(JNIEnv*
-    env,
-    jobject jcaller,
+    env, jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "IterateAndDoSomethingWithStructB");
@@ -166,11 +152,9 @@ void
       base::android::JavaParamRef<jobject>(env, jcaller));
 }
 
-extern "C" __attribute__((visibility("default")))
-jstring
+JNI_GENERATOR_EXPORT jstring
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeReturnAString(JNIEnv*
-    env,
-    jobject jcaller,
+    env, jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "ReturnAString", NULL);
@@ -181,8 +165,7 @@ jstring
 static jint GetInnerIntFunction(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& jcaller);
 
-extern "C" __attribute__((visibility("default")))
-jint
+JNI_GENERATOR_EXPORT jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024InnerClass_nativeGetInnerIntFunction(JNIEnv*
     env, jclass jcaller) {
   return GetInnerIntFunction(env, base::android::JavaParamRef<jclass>(env,