Merge "Use sockaddr_vm instead of VsockAddr for libbinder" into main am: dc80b806a7 am: d829d2b6db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3311669
Change-Id: I64f52b0b21a49a2505f8c2630677154d54f8454e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f794239..2135df5 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -153,6 +153,14 @@
"microdroid_gki-android15-6.6_kernel",
"microdroid_gki-android15-6.6.json",
],
+ // Internal option used by pkvm team while developing new features.
+ // Should not be used on production kernels.
+ "pkvm_experimental": [
+ "microdroid_gki-pkvm_experimental_initrd_debuggable",
+ "microdroid_gki-pkvm_experimental_initrd_normal",
+ "microdroid_gki-pkvm_experimental_kernel",
+ "microdroid_gki-pkvm_experimental.json",
+ ],
default: [],
}) + select(release_flag("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT"), {
true: ["com.android.virt.vfio_handler.rc"],
diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index d0838a6..1fc50f7 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -8,6 +8,7 @@
test_suites: [
"cts",
"general-tests",
+ "pts",
],
libs: [
"androidx.annotation_annotation",