From 609299c917664123d8b6e12bbfcc802af2e0ec48 Mon Sep 17 00:00:00 2001
From: Alice Wang <aliceywang@google.com>
Date: Fri, 7 Oct 2022 11:39:50 +0000
Subject: [PATCH] [API] Change libvm_payload to shared lib

Test: MicrodroidTests
Bug: 243512047
Bug: 250854486
Change-Id: I20d0613d2118c43d891d1fbb60ee8ab070cbb8e0
---
 compos/compos_key_helper/Android.bp | 2 +-
 microdroid/vm_payload/Android.bp    | 2 +-
 tests/testapk/Android.bp            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compos/compos_key_helper/Android.bp b/compos/compos_key_helper/Android.bp
index fdfcfc1f..c9480fcd 100644
--- a/compos/compos_key_helper/Android.bp
+++ b/compos/compos_key_helper/Android.bp
@@ -26,9 +26,9 @@ cc_binary {
 
     static_libs: [
         "libcompos_key",
-        "libvm_payload",
     ],
     shared_libs: [
+        "libvm_payload",
         "libbinder_ndk",
     ],
 }
diff --git a/microdroid/vm_payload/Android.bp b/microdroid/vm_payload/Android.bp
index f7223abc..4bfe6034 100644
--- a/microdroid/vm_payload/Android.bp
+++ b/microdroid/vm_payload/Android.bp
@@ -2,7 +2,7 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-rust_ffi_static {
+rust_ffi_shared {
     name: "libvm_payload",
     crate_name: "vm_payload",
     srcs: ["src/*.rs"],
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index e1c81247..3cb892a6 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -37,12 +37,12 @@ cc_library_shared {
         "libbinder_ndk",
         "libbinder_rpc_unstable",
         "MicrodroidTestNativeLibSub",
+        "libvm_payload",
     ],
     static_libs: [
         "libfsverity_digests_proto_cc",
         "liblog",
         "libprotobuf-cpp-lite-ndk",
-        "libvm_payload",
     ],
 }