commit aa1efc4204a03a1f1bffe0a5615fc769762f42af
author Andrew Walbran <qwandor@google.com> Wed Aug 10 13:33:57 2022 +0000
committer Andrew Walbran <qwandor@google.com> Tue Jan 10 14:31:48 2023 +0000
tree 67920c6e97886b7c69d08bdf81e5a33c68e48e32
parent e03da0d38c24898673b7060d7f0f32e79b14b304

Prepare for clap 4.

Bug: 260823636
Test: atest vm.test encryptedstore.test apkdmverity.test open_then_run.test ZipFuseTest
Change-Id: Iba2c4c317e7e42fc99362caf41ab083b4fc4a8db

avmd/Android.bp

diff --git a/avmd/Android.bp b/avmd/Android.bp
index 0b87a7b..e5e0553 100644
--- a/avmd/Android.bp
+++ b/avmd/Android.bp
@@ -20,8 +20,8 @@
     defaults: ["libavmd_defaults"],
 }
 
-rust_binary {
-    name: "avmdtool",
+rust_defaults {
+    name: "avmdtool.defaults",
     srcs: ["src/main.rs"],
     host_supported: true,
     prefer_rlib: true,
@@ -37,6 +37,17 @@
     ],
 }
 
+rust_binary {
+    name: "avmdtool",
+    defaults: ["avmdtool.defaults"],
+}
+
+rust_test {
+    name: "avmdtool.test",
+    defaults: ["avmdtool.defaults"],
+    test_suites: ["general-tests"],
+}
+
 rust_test {
     name: "avmdtool_tests",
     srcs: ["tests/*_test.rs"],