Merge "Tidy the hwtrust tool's subcommand help text" into main
diff --git a/remote_provisioning/hwtrust/Android.bp b/remote_provisioning/hwtrust/Android.bp
index ac38064..a42bc27 100644
--- a/remote_provisioning/hwtrust/Android.bp
+++ b/remote_provisioning/hwtrust/Android.bp
@@ -13,10 +13,17 @@
         "libcoset",
         "libhex",
         "libitertools",
-        "libopenssl",
         "libserde_json",
         "libthiserror",
     ],
+    target: {
+        host: {
+            rlibs: ["libopenssl_static"],
+        },
+        android: {
+            rustlibs: ["libopenssl"],
+        }
+    },
 }
 
 rust_library {
@@ -54,6 +61,16 @@
 rust_binary {
     name: "hwtrust",
     defaults: ["hwtrust_defaults"],
+    target: {
+        host: {
+            compile_multilib: "first",
+            dist: {
+                dir: "rkp/host",
+                targets: ["dist_files"],
+            },
+            static_executable: true,
+        },
+    }
 }
 
 rust_test {