summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-04-29 08:27:44 +0800
committerPo Lu <luangruo@yahoo.com>2023-04-29 08:27:44 +0800
commit3d7c06869d49d6470c5ca373f0d552b497eafb92 (patch)
treec18ce30e0459a30d23113c7dfff04eb8df5c4a11 /m4
parenta87272183baf29620037192af18c8353762bbb3e (diff)
downloademacs-3d7c06869d49d6470c5ca373f0d552b497eafb92.tar.gz
Update Android port
* build-aux/ndk-build-helper.mk (TARGET_ARCH): Define variable. * configure.ac (ENABLE_CHECKING, CHECK_STRUCTS) (GC_CHECK_STRING_OVERRUN, GC_CHECK_STRING_FREE_LIST, GLYPH_DEBUG) (GC_CHECK_STRING_BYTES): Enable checking correctly on Android. * java/README: Fix typos. * m4/ndk-build.m4 (ndk_run_test): Pass target arch. * src/android.c (android_get_content_name, android_close) (android_fclose, android_check_string): Fix various typos caught by checking. * src/charset.c (load_charset_map_from_file): Call emacs_fclose, not fclose. * src/image.c (image_set_transform): Fix thinko. (png_load_body, jpeg_load_body, gif_load): Call emacs_fclose, not fclose. Use open instead of fdopen. * src/xfaces.c (Fx_load_color_file): Likewise.
Diffstat (limited to 'm4')
-rw-r--r--m4/ndk-build.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/ndk-build.m4 b/m4/ndk-build.m4
index 9af681a08c8..8769e294452 100644
--- a/m4/ndk-build.m4
+++ b/m4/ndk-build.m4
@@ -104,7 +104,7 @@ ndk_run_test () {
EMACS_ABI="$ndk_ABI" ANDROID_MAKEFILE="$ndk_android_mk" \
NDK_BUILD_DIR="$ndk_DIR" NDK_ROOT="/tmp" \
ANDROID_MODULE_DIRECTORY="$ndk_dir" BUILD_AUXDIR=$ndk_AUX_DIR \
- 2>&AS_MESSAGE_LOG_FD >conftest.ndk
+ NDK_BUILD_ARCH="$ndk_ARCH" 2>&AS_MESSAGE_LOG_FD >conftest.ndk
# Read the output.
cat conftest.ndk | awk -f "$ndk_module_extract_awk" MODULE="$ndk_module"