diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-10-05 11:57:26 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-10-05 11:57:26 +0800 |
| commit | 253f1aff1ab00e9794f3cfcf50e86e335f411242 (patch) | |
| tree | 8a232f9683100875bac890832ee7c3af5ec07a3d /configure.ac | |
| parent | 511acc2ed827dd039eee1c6d70c77153825d5c67 (diff) | |
| download | emacs-253f1aff1ab00e9794f3cfcf50e86e335f411242.tar.gz | |
Port Emacs to Android 34
* configure.ac: Detect and require Android 34 headers.
* doc/emacs/android.texi (Android Environment): Mention new
permissions mandated by Android 34.
* java/AndroidManifest.xml.in: Introduce new permissions and
foreground service types prerequisite for background execution under
Android 34.
* java/INSTALL: Update installation documentation.
* java/org/gnu/emacs/EmacsSdk7FontDriver.java (Sdk7FontEntity)
(Sdk7FontObject):
* java/org/gnu/emacs/EmacsService.java (onCreate): Silence deprecation
warnings.
* src/android.c: Update documentation.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 9ae0dec3867..4456cd89b7a 100644 --- a/configure.ac +++ b/configure.ac @@ -941,7 +941,7 @@ a valid path to android.jar. See config.log for more details.]) fi AC_CACHE_CHECK([whether android.jar is new enough], - [emacs_cv_android_s_or_later], + [emacs_cv_android_u_or_later], AS_IF([rm -f conftest.class cat << EOF > conftest.java @@ -949,18 +949,18 @@ import android.os.Build; class conftest { - private static int test = Build.VERSION_CODES.TIRAMISU; + private static int test = Build.VERSION_CODES.UPSIDE_DOWN_CAKE; } EOF ("$JAVAC" -classpath "$with_android" -target 1.7 -source 1.7 conftest.java \ -d . >&AS_MESSAGE_LOG_FD 2>&1) && test -s conftest.class && rm -f conftest.class], - [emacs_cv_android_s_or_later=yes], - [emacs_cv_android_s_or_later=no])) + [emacs_cv_android_u_or_later=yes], + [emacs_cv_android_u_or_later=no])) - if test "$emacs_cv_android_s_or_later" = "no"; then + if test "$emacs_cv_android_u_or_later" = "no"; then AC_MSG_ERROR([Emacs must be built with an android.jar file produced for \ -Android 13 (Tiramisu) or later.]) +Android 14 (Upside Down Cake) or later.]) fi dnl See if the Java compiler supports the `--release' option which @@ -1152,6 +1152,8 @@ main (void) foo = "emacs_api_32"; #elif __ANDROID_API__ < 34 foo = "emacs_api_33"; +#elif __ANDROID_API__ < 35 + foo = "emacs_api_34"; #else foo = "emacs_api_future"; #endif |