Initialize Android API level earlier

* java/org/gnu/emacs/EmacsNative.java (EmacsNative):
* java/org/gnu/emacs/EmacsNoninteractive.java (main):
* java/org/gnu/emacs/EmacsService.java (run):
* java/org/gnu/emacs/EmacsThread.java (run):
* src/android.c (initEmacs, setEmacsParams): Set
`android_api_level' within setEmacsParams, not in initEmacs.
* src/androidvfs.c: Pacify compiler warnings.

2 files changed, 21 insertions, 5 deletions

diff --git a/src/android.c b/src/android.c
index 8c0232a51f8..f60ff5acb54 100644
--- a/src/android.c
+++ b/src/android.c
@@ -1281,7 +1281,8 @@ NATIVE_NAME (setEmacsParams) (JNIEnv *env, jobject object,
                               jfloat pixel_density_y,
                               jfloat scaled_density,
                               jobject class_path,
-                              jobject emacs_service_object)
+                              jobject emacs_service_object,
+                              jint api_level)
 {
   JNI_STACK_ALIGNMENT_PROLOGUE;
 
@@ -1289,6 +1290,10 @@ NATIVE_NAME (setEmacsParams) (JNIEnv *env, jobject object,
   pthread_t thread;
   const char *java_string;
 
+  /* Set the Android API level early, as it is used by
+     `android_vfs_init'.  */
+  android_api_level = api_level;
+
   /* This function should only be called from the main thread.  */
 
   android_pixel_density_x = pixel_density_x;
@@ -1771,7 +1776,7 @@ android_init_emacs_cursor (void)
 
 JNIEXPORT void JNICALL
 NATIVE_NAME (initEmacs) (JNIEnv *env, jobject object, jarray argv,
-                         jobject dump_file_object, jint api_level)
+                         jobject dump_file_object)
 {
   /* android_emacs_init is not main, so GCC is not nice enough to add
      the stack alignment prologue.
@@ -1788,9 +1793,6 @@ NATIVE_NAME (initEmacs) (JNIEnv *env, jobject object, jarray argv,
   const char *c_argument;
   char *dump_file;
 
-  /* Set the Android API level.  */
-  android_api_level = api_level;
-
   android_java_env = env;
 
   nelements = (*env)->GetArrayLength (env, argv);
diff --git a/src/androidvfs.c b/src/androidvfs.c
index 9acc8f2b139..eeef5ea5db0 100644
--- a/src/androidvfs.c
+++ b/src/androidvfs.c
@@ -5976,6 +5976,14 @@ android_saf_new_opendir (struct android_vnode *vnode)
 /* Semaphore posted upon the completion of an SAF operation.  */
 static sem_t saf_completion_sem;
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+#else /* GNUC */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#endif /* __clang__ */
+
 JNIEXPORT jint JNICALL
 NATIVE_NAME (safSyncAndReadInput) (JNIEnv *env, jobject object)
 {
@@ -6010,6 +6018,12 @@ NATIVE_NAME (safPostRequest) (JNIEnv *env, jobject object)
   sem_post (&saf_completion_sem);
 }
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#else /* GNUC */
+#pragma GCC diagnostic pop
+#endif /* __clang__ */
+
 
 
 /* Root vnode.  This vnode represents the root inode, and is a regular