5 files changed, 19 insertions, 7 deletions

diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index c4a9d1f5177..527ce74c474 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -53,7 +53,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
   <uses-permission android:name="android.permission.CAMERA" />
 
   <uses-sdk android:minSdkVersion="@ANDROID_MIN_SDK@"
-            android:targetSdkVersion="28"/>
+            android:targetSdkVersion="33"/>
 
   <application android:name="org.gnu.emacs.EmacsApplication"
                android:label="Emacs"
diff --git a/java/Makefile.in b/java/Makefile.in
index 755995b93b1..a7bc8ac027a 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -33,6 +33,7 @@ AAPT = @AAPT@
 D8 = @D8@
 ZIPALIGN = @ZIPALIGN@
 JARSIGNER = @JARSIGNER@
+APKSIGNER = @APKSIGNER@
 JARSIGNER_FLAGS =
 ANDROID_JAR = @ANDROID_JAR@
 ANDROID_ABI = @ANDROID_ABI@
@@ -52,6 +53,8 @@ JARSIGNER_FLAGS =
 endif
 
 SIGN_EMACS = -keystore emacs.keystore -storepass emacs1 $(JARSIGNER_FLAGS)
+SIGN_EMACS_V2 = sign --v2-signing-enabled --ks emacs.keystore \
+        --debuggable-apk-permitted --ks-pass pass:emacs1
 
 JAVA_FILES = $(shell find . -type f -name *.java)
 CLASS_FILES = $(foreach file,$(JAVA_FILES),$(basename $(file)).class)
@@ -196,10 +199,12 @@ $(APK_NAME): classes.dex emacs.apk-in emacs.keystore
         $(AAPT) add $@.unaligned classes.dex
         $(JARSIGNER) $(SIGN_EMACS) $@.unaligned "Emacs keystore"
         $(ZIPALIGN) -f 4 $@.unaligned $@
-        rm -f $@.unaligned
+# Signing must happen after alignment!
+        $(APKSIGNER) $(SIGN_EMACS_V2) $@
+        rm -f $@.unaligned *.idsig
 
 clean:
-        rm -f *.apk emacs.apk-in *.dex *.unaligned *.class
+        rm -f *.apk emacs.apk-in *.dex *.unaligned *.class *.idsig
         rm -rf install-temp
         find . -name '*.class' -delete
 
diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java
index a772b965301..7bf8b5f6081 100644
--- a/java/org/gnu/emacs/EmacsNative.java
+++ b/java/org/gnu/emacs/EmacsNative.java
@@ -65,8 +65,11 @@ public class EmacsNative
      undefined.
 
      DUMPFILE is the dump file to use, or NULL if Emacs is to load
-     loadup.el itself.  */
-  public static native void initEmacs (String argv[], String dumpFile);
+     loadup.el itself.
+
+     APILEVEL is the version of Android being used.  */
+  public static native void initEmacs (String argv[], String dumpFile,
+                                       int apiLevel);
 
   /* Abort and generate a native core dump.  */
   public static native void emacsAbort ();
diff --git a/java/org/gnu/emacs/EmacsNoninteractive.java b/java/org/gnu/emacs/EmacsNoninteractive.java
index b4854d8323f..4da82f2f894 100644
--- a/java/org/gnu/emacs/EmacsNoninteractive.java
+++ b/java/org/gnu/emacs/EmacsNoninteractive.java
@@ -177,6 +177,7 @@ public class EmacsNoninteractive
     EmacsApplication.findDumpFile (context);
 
     /* Start Emacs.  */
-    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName);
+    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
+                           Build.VERSION.SDK_INT);
   }
 };
diff --git a/java/org/gnu/emacs/EmacsThread.java b/java/org/gnu/emacs/EmacsThread.java
index f5e9d54044a..2724d838d41 100644
--- a/java/org/gnu/emacs/EmacsThread.java
+++ b/java/org/gnu/emacs/EmacsThread.java
@@ -21,6 +21,8 @@ package org.gnu.emacs;
 
 import java.lang.Thread;
 
+import android.os.Build;
+
 public class EmacsThread extends Thread
 {
   /* Whether or not Emacs should be started -Q.  */
@@ -45,6 +47,7 @@ public class EmacsThread extends Thread
       args = new String[] { "libandroid-emacs.so", "-Q", };
 
     /* Run the native code now.  */
-    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName);
+    EmacsNative.initEmacs (args, EmacsApplication.dumpFileName,
+                           Build.VERSION.SDK_INT);
   }
 };