summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-05-06 11:32:56 +0800
committerPo Lu <luangruo@yahoo.com>2023-05-06 11:32:56 +0800
commit3198b7dc565e0e41d40b6c23509c285e96044a83 (patch)
treec9193f1b8825c30fac483ed66e02eb9181397668 /cross
parent96f9fe6514a2139373c50e19a77fd217ef62e6ef (diff)
downloademacs-3198b7dc565e0e41d40b6c23509c285e96044a83.tar.gz
Update Android port
* cross/verbose.mk.android: Get rid of badly aligned ANDROID_CC messages. * java/org/gnu/emacs/EmacsInputConnection.java (syncAfterCommit) (extractAbsoluteOffsets): Add workarounds for several kinds of machines. (commitText, getExtractedText): Likewise. * src/textconv.c (really_commit_text): Improve definition of POSITION. (get_extracted_text): Default to providing at least 4 characters.
Diffstat (limited to 'cross')
-rw-r--r--cross/verbose.mk.android22
1 files changed, 6 insertions, 16 deletions
diff --git a/cross/verbose.mk.android b/cross/verbose.mk.android
index 7d07b978de2..998f9843c7d 100644
--- a/cross/verbose.mk.android
+++ b/cross/verbose.mk.android
@@ -27,16 +27,7 @@ AM_V_CC =
AM_V_CXX =
AM_V_CCLD =
AM_V_CXXLD =
-AM_V_ELC =
-AM_V_ELN =
AM_V_GEN =
-AM_V_GLOBALS =
-AM_V_NO_PD =
-AM_V_RC =
-AM_V_JAVAC =
-AM_V_DX =
-AM_V_AAPT =
-AM_V_ZIPALIGN =
else
# Whether $(info ...) works. This is to work around a bug in GNU Make
@@ -53,13 +44,12 @@ have_working_info = $(filter notintermediate,$(value .FEATURES))
# The workaround is done only for AM_V_ELC and AM_V_ELN,
# since the bug is not annoying elsewhere.
-AM_V_AR = @$(info $ AR $@)
+AM_V_AR = @$(info $ AR $@)
AM_V_at = @
-AM_V_CC = @$(info $ ANDROID_CC $@)
-AM_V_CXX = @$(info $ ANDROID_CXX $@)
-AM_V_CCLD = @$(info $ CCLD $@)
-AM_V_CXXLD = @$(info $ CXXLD $@)
-
-AM_V_GEN = @$(info $ GEN $@)
+AM_V_CC = @$(info $ CC $@)
+AM_V_CXX = @$(info $ CXX $@)
+AM_V_CCLD = @$(info $ CCLD $@)
+AM_V_CXXLD = @$(info $ CXXLD $@)
+AM_V_GEN = @$(info $ GEN $@)
AM_V_NO_PD = --no-print-directory
endif