diff options
| author | Po Lu | 2023-04-29 08:27:44 +0800 |
|---|---|---|
| committer | Po Lu | 2023-04-29 08:27:44 +0800 |
| commit | 3d7c06869d49d6470c5ca373f0d552b497eafb92 (patch) | |
| tree | c18ce30e0459a30d23113c7dfff04eb8df5c4a11 /build-aux | |
| parent | a87272183baf29620037192af18c8353762bbb3e (diff) | |
| download | emacs-3d7c06869d49d6470c5ca373f0d552b497eafb92.tar.gz emacs-3d7c06869d49d6470c5ca373f0d552b497eafb92.zip | |
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.mk | 3 |
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 @@ | |||
| 24 | # TARGET_ARCH_ABI is the ABI that is being built for. | 24 | # TARGET_ARCH_ABI is the ABI that is being built for. |
| 25 | TARGET_ARCH_ABI := $(EMACS_ABI) | 25 | TARGET_ARCH_ABI := $(EMACS_ABI) |
| 26 | 26 | ||
| 27 | # TARGET_ARCH is the architecture that is being built for. | ||
| 28 | TARGET_ARCH := $(NDK_BUILD_ARCH) | ||
| 29 | |||
| 27 | # NDK_LAST_MAKEFILE is the last Makefile that was included. | 30 | # NDK_LAST_MAKEFILE is the last Makefile that was included. |
| 28 | NDK_LAST_MAKEFILE = $(lastword $(filter %Android.mk,$(MAKEFILE_LIST))) | 31 | NDK_LAST_MAKEFILE = $(lastword $(filter %Android.mk,$(MAKEFILE_LIST))) |
| 29 | 32 | ||