commit 5a838a0f47c38c71c3656f83090c70d46ef6f1ea
author Alice Wang <aliceywang@google.com> Mon Oct 10 16:09:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 10 16:09:30 2022 +0000
tree 287ae28670b945653a65a56b829baa851828e5e0
parent c9755093d578d3244648a7eaa01721605a36ca10
parent 609299c917664123d8b6e12bbfcc802af2e0ec48

Merge "[API] Change libvm_payload to shared lib"

compos/compos_key_helper/Android.bp

diff --git a/compos/compos_key_helper/Android.bp b/compos/compos_key_helper/Android.bp
index fdfcfc1..c9480fc 100644
--- a/compos/compos_key_helper/Android.bp
+++ b/compos/compos_key_helper/Android.bp
@@ -26,9 +26,9 @@
 
     static_libs: [
         "libcompos_key",
-        "libvm_payload",
     ],
     shared_libs: [
+        "libvm_payload",
         "libbinder_ndk",
     ],
 }

microdroid/vm_payload/Android.bp

diff --git a/microdroid/vm_payload/Android.bp b/microdroid/vm_payload/Android.bp
index f7223ab..4bfe603 100644
--- a/microdroid/vm_payload/Android.bp
+++ b/microdroid/vm_payload/Android.bp
@@ -2,7 +2,7 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-rust_ffi_static {
+rust_ffi_shared {
     name: "libvm_payload",
     crate_name: "vm_payload",
     srcs: ["src/*.rs"],

tests/testapk/Android.bp

diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 425b6f0..e738930 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -40,12 +40,12 @@
         "libbinder_ndk",
         "libbinder_rpc_unstable",
         "MicrodroidTestNativeLibSub",
+        "libvm_payload",
     ],
     static_libs: [
         "libfsverity_digests_proto_cc",
         "liblog",
         "libprotobuf-cpp-lite-ndk",
-        "libvm_payload",
     ],
 }