commit 20055a64840f6ab8761447781dda80862946ee80
author Dan Willemsen <dwillemsen@google.com> Wed Sep 22 20:39:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 22 20:39:36 2021 +0000
tree 4eb0b32c1ef22957d59956850af3ce8f105b373d
parent f08d2c71b5c82cb34e464b70ed901a3a1ca4d5b3
parent e290dbccf564795bd8bf530a5bb2ddb60cc22664

Enable apksigner for Windows am: cb5e16ea45 am: e290dbccf5

Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/1832095

Change-Id: I09b6b836ecd79602176d3dedc5788d4088c07b84

Android.bp

diff --git a/Android.bp b/Android.bp
index 09cddbf..b218132 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,6 +39,11 @@
         "src/main/java/**/*.java",
     ],
     java_version: "1.8",
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 // apksigner command-line tool for signing APKs and verifying their signatures
@@ -53,6 +58,14 @@
         "apksig",
         "conscrypt-unbundled",
     ],
-    jni_libs: ["libconscrypt_openjdk_jni"],
     java_version: "1.8",
+    target: {
+        not_windows: {
+            jni_libs: ["libconscrypt_openjdk_jni"],
+        },
+        windows: {
+            enabled: true,
+            wrapper: "etc/apksigner.bat",
+        },
+    },
 }