aboutsummaryrefslogtreecommitdiffstats
path: root/java/Makefile.in
diff options
context:
space:
mode:
authorPo Lu2023-01-25 19:15:30 +0800
committerPo Lu2023-01-25 19:15:30 +0800
commit888d3514967a90423d60dfa82bfd59b7f3df6c90 (patch)
tree33295e1eb9fad9fd675f35ad0b27554ef509e2fa /java/Makefile.in
parentd63ee136d92247597d82ddc44ec71f6f71c28b5f (diff)
downloademacs-888d3514967a90423d60dfa82bfd59b7f3df6c90.tar.gz
emacs-888d3514967a90423d60dfa82bfd59b7f3df6c90.zip
Minor fixes to Android port
* java/Makefile.in: (emacs.apk-in): Don't call cp with empty args. * java/org/gnu/emacs/EmacsDrawLine.java (perform): Fix for PostScript filling semantics. * src/Makefile.in (android-emacs): Build android-emacs directly.
Diffstat (limited to 'java/Makefile.in')
-rw-r--r--java/Makefile.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/Makefile.in b/java/Makefile.in
index b32b2442305..755995b93b1 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -150,7 +150,9 @@ emacs.apk-in: $(CROSS_BINS) $(CROSS_LIBS) $(libsrc)/asset-directory-tool \
150 cp -f $$file install_temp/lib/$(ANDROID_ABI); \ 150 cp -f $$file install_temp/lib/$(ANDROID_ABI); \
151 fi \ 151 fi \
152 done 152 done
153ifneq ($(NDK_BUILD_SHARED),)
153 cp -f $(NDK_BUILD_SHARED) install_temp/lib/$(ANDROID_ABI) 154 cp -f $(NDK_BUILD_SHARED) install_temp/lib/$(ANDROID_ABI)
155endif
154# Package everything. Specifying the assets on this command line is 156# Package everything. Specifying the assets on this command line is
155# necessary for AAssetManager_getNextFileName to work on old versions 157# necessary for AAssetManager_getNextFileName to work on old versions
156# of Android. 158# of Android.