1 files changed, 22 insertions, 17 deletions
diff --git a/verity/Android.bp b/verity/Android.bp
index 47379116..550b800b 100644
--- a/verity/Android.bp
+++ b/verity/Android.bp
@@ -12,8 +12,8 @@ cc_binary_host {
     ],
 }
 
-java_binary_host {
-    name: "verity_signer",
+java_library_host {
+    name: "VeritySigner",
     srcs: [
         "VeritySigner.java",
         "Utils.java",
@@ -23,8 +23,8 @@ java_binary_host {
     static_libs: ["bouncycastle-unbundled"],
 }
 
-java_binary_host {
-    name: "boot_signer",
+java_library_host {
+    name: "BootSignature",
     srcs: [
         "BootSignature.java",
         "VeritySigner.java",
@@ -131,17 +131,22 @@ cc_test {
     ],
 }
 
-python_binary_host {
-    name: "build_verity_metadata",
-    srcs: ["build_verity_metadata.py"],
-    version: {
-        py2: {
-            enabled: true,
-            embedded_launcher: true,
-        },
-        py3: {
-            enabled: false,
-            embedded_launcher: false,
-        },
-    },
+// VeritySigner should probably just be a java_binary
+sh_binary_host {
+    name: "verity_signer",
+    src: "verity_signer",
+    required: ["VeritySigner"],
+}
+
+// BootSignature should probably just be a java_binary
+sh_binary_host {
+    name: "boot_signer",
+    src: "boot_signer",
+    required: ["BootSignature"],
+}
+
+// This should probably be a python_binary_host
+sh_binary_host {
+    name: "build_verity_metadata.py",
+    src: "build_verity_metadata.py",
 }