summaryrefslogtreecommitdiff
path: root/build-aux
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 /build-aux
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 'build-aux')
-rw-r--r--build-aux/ndk-build-helper.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/build-aux/ndk-build-helper.mk b/build-aux/ndk-build-helper.mk
index 85ddc5c6330..05f0af76411 100644
--- a/build-aux/ndk-build-helper.mk
+++ b/build-aux/ndk-build-helper.mk
@@ -24,6 +24,9 @@
# TARGET_ARCH_ABI is the ABI that is being built for.
TARGET_ARCH_ABI := $(EMACS_ABI)
+# TARGET_ARCH is the architecture that is being built for.
+TARGET_ARCH := $(NDK_BUILD_ARCH)
+
# NDK_LAST_MAKEFILE is the last Makefile that was included.
NDK_LAST_MAKEFILE = $(lastword $(filter %Android.mk,$(MAKEFILE_LIST)))