aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2023-02-05 23:02:14 +0800
committerPo Lu2023-02-05 23:02:14 +0800
commit98c90135fe5f3729a3fa6e9a724d04a78b2cd514 (patch)
treee4d05533619b88dac6f45768af837629675b65e2 /src
parent1b8beed9608b56889f23b49704033ef6437462cd (diff)
downloademacs-98c90135fe5f3729a3fa6e9a724d04a78b2cd514.tar.gz
emacs-98c90135fe5f3729a3fa6e9a724d04a78b2cd514.zip
Update Android port
* INSTALL.android: Explain how to build selinux. * configure.ac: Enable selinux on Android. * cross/ndk-build/ndk-build-shared-library.mk: ($(call objname,$(LOCAL_MODULE),$(basename $(1))))::($$(error Unsupported suffix)::(NDK_CFLAGS_$(LOCAL_MODULE)): * cross/ndk-build/ndk-build-static-library.mk: ($(call objname,$(LOCAL_MODULE),$(basename $(1))))::($$(error Unsupported suffix)::(NDK_CFLAGS_$(LOCAL_MODULE)): Correctly handle files with a .cc suffix, and clang-specific asflags. * cross/ndk-build/ndk-clear-vars.mk: Handle AOSP extensions LOCAL_ADDITIONAL_DEPENDENCIES, LOCAL_CLANG_ASFLAGS_$(NDK_BUILD_ARCH) and LOCAL_IS_HOST_MODULE. * doc/emacs/android.texi (Android Startup): Explain emacsclient wrapper. * java/org/gnu/emacs/EmacsView.java (EmacsView): New flag `isCurrentlyTextEditor'. (showOnScreenKeyboard, hideOnScreenKeyboard): Set as appropriate. (onCheckIsTextEditor): Return its value. * lisp/touch-screen.el (touch-screen-handle-scroll): Don't ding at buffer limits. * m4/ndk-build.m4: Improve doc. * src/Makefile.in (LIBSELINUX_CFLAGS): New variable. (EMACS_CFLAGS): Add it.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index f17e34be616..d5d979a9bd3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -349,6 +349,7 @@ CM_OBJ=@CM_OBJ@
349LIBGPM = @LIBGPM@ 349LIBGPM = @LIBGPM@
350 350
351LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ 351LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
352LIBSELINUX_CFLAGS = @LIBSELINUX_CFLAGS@
352 353
353LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ 354LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
354LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 355LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
@@ -437,7 +438,7 @@ EMACS_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
437 $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ 438 $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
438 $(WERROR_CFLAGS) $(HAIKU_CFLAGS) $(XCOMPOSITE_CFLAGS) $(XSHAPE_CFLAGS) \ 439 $(WERROR_CFLAGS) $(HAIKU_CFLAGS) $(XCOMPOSITE_CFLAGS) $(XSHAPE_CFLAGS) \
439 $(ANDROID_CFLAGS) $(GIF_CFLAGS) $(JPEG_CFLAGS) $(SQLITE3_CFLAGS) \ 440 $(ANDROID_CFLAGS) $(GIF_CFLAGS) $(JPEG_CFLAGS) $(SQLITE3_CFLAGS) \
440 $(LIBGMP_CFLAGS) $(TIFF_CFLAGS) 441 $(LIBGMP_CFLAGS) $(TIFF_CFLAGS) $(LIBSELINUX_CFLAGS)
441ALL_CFLAGS = $(EMACS_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) 442ALL_CFLAGS = $(EMACS_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
442ALL_OBJC_CFLAGS = $(EMACS_CFLAGS) \ 443ALL_OBJC_CFLAGS = $(EMACS_CFLAGS) \
443 $(filter-out $(NON_OBJC_CFLAGS),$(WARN_CFLAGS)) $(CFLAGS) \ 444 $(filter-out $(NON_OBJC_CFLAGS),$(WARN_CFLAGS)) $(CFLAGS) \