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.

2 files changed, 7 insertions, 2 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 \
             cp -f $$file install_temp/lib/$(ANDROID_ABI);       \
           fi                                                    \
         done
+ifneq ($(NDK_BUILD_SHARED),)
         cp -f $(NDK_BUILD_SHARED) install_temp/lib/$(ANDROID_ABI)
+endif
 # Package everything.  Specifying the assets on this command line is
 # necessary for AAssetManager_getNextFileName to work on old versions
 # of Android.
diff --git a/java/org/gnu/emacs/EmacsDrawLine.java b/java/org/gnu/emacs/EmacsDrawLine.java
index 827feb96dfb..717e2279a7d 100644
--- a/java/org/gnu/emacs/EmacsDrawLine.java
+++ b/java/org/gnu/emacs/EmacsDrawLine.java
@@ -56,9 +56,12 @@ public class EmacsDrawLine
 
     paint.setStyle (Paint.Style.STROKE);
 
+    /* Since drawLine has PostScript style behavior, adjust the
+       coordinates appropriately.  */
+
     if (gc.clip_mask == null)
-      canvas.drawLine ((float) x, (float) y,
-                       (float) x2, (float) y2,
+      canvas.drawLine ((float) x + 0.5f, (float) y + 0.5f,
+                       (float) x2 + 0.5f, (float) y2 + 0.5f,
                        paint);
 
     /* DrawLine with clip mask not implemented; it is not used by