verity: Update the build rules for verity tools.

Test: `m -j dist` with aosp_marlin-userdebug (which uses the tools in
      this dir).
Test: TreeHugger
Change-Id: I39bae841ff287c431459fd42a4f64b099f12396e

4 files changed, 17 insertions, 38 deletions

diff --git a/verity/Android.bp b/verity/Android.bp
index 550b800b..47379116 100644
--- a/verity/Android.bp
+++ b/verity/Android.bp
@@ -12,8 +12,8 @@ cc_binary_host {
     ],
 }
 
-java_library_host {
-    name: "VeritySigner",
+java_binary_host {
+    name: "verity_signer",
     srcs: [
         "VeritySigner.java",
         "Utils.java",
@@ -23,8 +23,8 @@ java_library_host {
     static_libs: ["bouncycastle-unbundled"],
 }
 
-java_library_host {
-    name: "BootSignature",
+java_binary_host {
+    name: "boot_signer",
     srcs: [
         "BootSignature.java",
         "VeritySigner.java",
@@ -131,22 +131,17 @@ cc_test {
     ],
 }
 
-// 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",
+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,
+        },
+    },
 }
diff --git a/verity/boot_signer b/verity/boot_signer
deleted file mode 100755
index e2ee42bf..00000000
--- a/verity/boot_signer
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-# Start-up script for BootSigner
-
-BOOTSIGNER_HOME=`dirname "$0"`
-BOOTSIGNER_HOME=`dirname "$BOOTSIGNER_HOME"`
-
-java -Xmx512M -jar "$BOOTSIGNER_HOME"/framework/BootSignature.jar "$@"
\ No newline at end of file
diff --git a/verity/build_verity_metadata.py b/verity/build_verity_metadata.py
index 5a7d7d27..5a7d7d27 100755..100644
--- a/verity/build_verity_metadata.py
+++ b/verity/build_verity_metadata.py
diff --git a/verity/verity_signer b/verity/verity_signer
deleted file mode 100755
index a4f337ae..00000000
--- a/verity/verity_signer
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-# Start-up script for VeritySigner
-
-VERITYSIGNER_HOME=`dirname "$0"`
-VERITYSIGNER_HOME=`dirname "$VERITYSIGNER_HOME"`
-
-java -Xmx512M -jar "$VERITYSIGNER_HOME"/framework/VeritySigner.jar "$@"
\ No newline at end of file