commit bcc2ec27fe5e722e9ca250e3c7c6125c2f193457
author Alan Stokes <alanstokes@google.com> Mon Oct 31 17:02:50 2022 +0000
committer Alan Stokes <alanstokes@google.com> Mon Nov 28 11:15:29 2022 +0000
tree 81f25b763b5fcc855e8d5d0f2c1ee050099db642
parent 03a8770262e22f9a333cc1b8349d08c260e33b08

libvm_payload as a cc_library

Define a symbole file for libvm_payload, and request stubs. Make sure
the clients build against the stubs.

Mark the implementation as not required, to prevent the missing
dependencies check triggering; it is actually present at runtime
inside Microdroid.

Bug: 243512108
Bug: 255920361
Test: atest MicrodroidTests
Test: composd-cmd test-compile
Change-Id: I78c33b6fba706fd0e52435ac13d02a25171862f1

tests/benchmark/Android.bp

diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp
index 10cdac5..9d2b6c7 100644
--- a/tests/benchmark/Android.bp
+++ b/tests/benchmark/Android.bp
@@ -38,6 +38,6 @@
         "libbase",
         "libbinder_ndk",
         "liblog",
-        "libvm_payload",
+        "libvm_payload#current",
     ],
 }

tests/testapk/Android.bp

diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index df7c6c0..4dc9489 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -39,7 +39,7 @@
     shared_libs: [
         "libbinder_ndk",
         "MicrodroidTestNativeLibSub",
-        "libvm_payload",
+        "libvm_payload#current",
     ],
     static_libs: [
         "com.android.microdroid.testservice-ndk",