summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-02-24 22:25:48 +0800
committerPo Lu <luangruo@yahoo.com>2023-02-24 22:25:48 +0800
commitea74f3c0678d0729a8d6307e35c2d228f665afa3 (patch)
tree123796d853d714bed9662301cff3c1a4a0baacef /java
parent4ff3904e3c2767b2840624db68b5cf9db2246d3b (diff)
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.
Diffstat (limited to 'java')
-rw-r--r--java/Makefile.in5
-rw-r--r--java/org/gnu/emacs/EmacsSdk7FontDriver.java2
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