diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-01-26 19:54:38 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-01-26 19:54:38 +0800 |
| commit | 22f7ad1057e1a1e20933e0a1ff2a858ecd9e3fec (patch) | |
| tree | d4e78a253eb91723411badef5d47e229562e642e /m4 | |
| parent | 4255d7f0514c5fa1badded6b0bc445ec2d2764c0 (diff) | |
| download | emacs-22f7ad1057e1a1e20933e0a1ff2a858ecd9e3fec.tar.gz | |
Update Android port
* INSTALL.android: Document how to install sqlite3.
* build-aux/ndk-build-helper-1.mk (SYSTEM_LIBRARIES):
* build-aux/ndk-build-helper-2.mk (SYSTEM_LIBRARIES): Add liblog
and libandroid.
* configure.ac (SQLITE3_LIBS, HAVE_SQLITE3)
(HAVE_SQLITE3_LOAD_EXTENSION): Support on Android.
(APKSIGNER): Look for this new required binary.
* cross/ndk-build/ndk-build-shared-library.mk (objname):
* cross/ndk-build/ndk-build-static-library.mk (objname): Avoid
duplicate rules by prefixing objects with module type.
* cross/ndk-build/ndk-build.mk.in (NDK_BUILD_SHARED): Fix
definition.
* cross/ndk-build/ndk-resolve.mk:
(NDK_SO_EXTRA_FLAGS_$(LOCAL_MODULE)): Handle new system
libraries.
* doc/emacs/android.texi (Android File System): Document Android
10 system restriction.
* java/AndroidManifest.xml.in: Target Android 33, not 28.
* java/Makefile.in (SIGN_EMACS_V2, APKSIGNER): New variables.
($(APK_NAME)): Make sure to apply a ``version 2 signature'' to
the package as well.
* java/org/gnu/emacs/EmacsNative.java (EmacsNative): New
argument apiLevel.
* java/org/gnu/emacs/EmacsNoninteractive.java (main):
* java/org/gnu/emacs/EmacsThread.java (run): Pass API level.
* m4/ndk-build.m4 (ndk_package_mape): Add package mapping for
sqlite3.
* src/Makefile.in (SQLITE3_CFLAGS): New substition.
(EMACS_CFLAGS): Add that variable.
* src/android.c (android_api_level): New variable.
(initEmacs): Set it.
(android_file_access_p): Make static.
(android_hack_asset_fd): Adjust for restrictions in Android 29
and later.
(android_close_on_exec): New function.
(android_open): Adjust to not duplicate file descriptor even if
CLOEXEC.
(android_faccessat): Use fstatat at-func emulation.
* src/android.h: Update prototypes.
* src/dired.c (file_name_completion_dirp):
* src/fileio.c (file_access_p, Faccess_file): Now that
sys_faccessat takes care of everything, stop calling
android_file_access_p.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ndk-build.m4 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/m4/ndk-build.m4 b/m4/ndk-build.m4 index 27092e4b400..bcfe0fed6fe 100644 --- a/m4/ndk-build.m4 +++ b/m4/ndk-build.m4 @@ -73,6 +73,7 @@ esac # ones. ndk_package_map="libwebpdemux:webpdemux libxml-2.0:libxml2 jansson:libjansson" +ndk_package_map="$ndk_package_map sqlite3:libsqlite_static_minimal" # Replace ndk_module with the appropriate Android module name if it is # found in ndk_package_map. |