Improve Android configury

* configure.ac (JAVA_PUSH_LINT): New macro.
(JAVAFLAGS): New variable.  Check for various lint flags and
macros and enable them.
* java/Makefile.in (ANDROID_ABI):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java: Remove compiler
warning.

2 files changed, 2 insertions, 5 deletions

diff --git a/java/Makefile.in b/java/Makefile.in
index af44d551701..7ba05f6c9a3 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -40,10 +40,7 @@ ANDROID_JAR = @ANDROID_JAR@
 ANDROID_ABI = @ANDROID_ABI@
 ANDROID_SDK_18_OR_EARLIER = @ANDROID_SDK_18_OR_EARLIER@
 ANDROID_SDK_8_OR_EARLIER = @ANDROID_SDK_8_OR_EARLIER@
-
-WARN_JAVAFLAGS = -Xlint:deprecation
-JAVAFLAGS = -classpath "$(ANDROID_JAR):." -target 1.7 -source 1.7 \
-  $(WARN_JAVAFLAGS)
+JAVAFLAGS = @JAVAFLAGS@
 
 # Android 4.3 and earlier require Emacs to be signed with a different
 # digital signature algorithm.
diff --git a/java/org/gnu/emacs/EmacsSdk7FontDriver.java b/java/org/gnu/emacs/EmacsSdk7FontDriver.java
index a964cadb74c..ba92d4cef49 100644
--- a/java/org/gnu/emacs/EmacsSdk7FontDriver.java
+++ b/java/org/gnu/emacs/EmacsSdk7FontDriver.java
@@ -325,7 +325,7 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver
           list.add (new Sdk7FontEntity (typefaceList[i]));
       }
 
-    return (FontEntity[]) list.toArray (new FontEntity[0]);
+    return list.toArray (new FontEntity[0]);
   }
 
   @Override