Statically link AIDL code
There's no need for it to be in its own .so, there's only one client
in each VM, and we should demonstrate typical usage.
Also remove some now-redundant code in the benchmark app. (The build
started complaining, not sure why.)
Bug: 255920361
Test: atest MicrodroidTests
Change-Id: I6377b96e5cb8686794931b2e8637b16d8428d91f
diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp
index 2ba3881..e6f39f8 100644
--- a/tests/benchmark/Android.bp
+++ b/tests/benchmark/Android.bp
@@ -39,10 +39,11 @@
cc_library_shared {
name: "MicrodroidBenchmarkNativeLib",
srcs: ["src/native/benchmarkbinary.cpp"],
- static_libs: ["libiobenchmark"],
- shared_libs: [
- "android.system.virtualmachineservice-ndk",
+ static_libs: [
"com.android.microdroid.testservice-ndk",
+ "libiobenchmark",
+ ],
+ shared_libs: [
"libbase",
"libbinder_ndk",
"liblog",