Make packages/modules/Virtualization tests available to the platform
Soong was accidentally allowing a corner case where modules that
were not supposed to be available to the platform (due to
apex_available being set to an apex and not including
"//apex_available:platform") were being made available to the
platform as long as no apex modules depended on them. Move the
apex_available: ["com.android.virt"] from the defaults modules
to the rust_library modules so that it doesn't apply to the
rust_test modules.
Bug: 394664568
Test: compare out/soong/installs-${TARGET_PRODUCT}.mk
Change-Id: Idff0deb6063ad0bc4ce4a95c43f6fb4d19e57260
diff --git a/android/virtmgr/fsfdt/Android.bp b/android/virtmgr/fsfdt/Android.bp
index 1d03522..64a253d 100644
--- a/android/virtmgr/fsfdt/Android.bp
+++ b/android/virtmgr/fsfdt/Android.bp
@@ -28,12 +28,12 @@
"liblibfdt",
"libanyhow",
],
- apex_available: ["com.android.virt"],
}
rust_library_rlib {
name: "libfsfdt",
defaults: ["libfsfdt_default"],
+ apex_available: ["com.android.virt"],
}
rust_test {
diff --git a/android/virtualizationservice/Android.bp b/android/virtualizationservice/Android.bp
index fb6e39a..6f76510 100644
--- a/android/virtualizationservice/Android.bp
+++ b/android/virtualizationservice/Android.bp
@@ -55,12 +55,12 @@
"libservice_vm_comm",
"libservice_vm_manager",
],
- apex_available: ["com.android.virt"],
}
rust_binary {
name: "virtualizationservice",
defaults: ["virtualizationservice_defaults"],
+ apex_available: ["com.android.virt"],
}
xsd_config {
diff --git a/guest/compos_key_helper/Android.bp b/guest/compos_key_helper/Android.bp
index 4d86780..0cd4c33 100644
--- a/guest/compos_key_helper/Android.bp
+++ b/guest/compos_key_helper/Android.bp
@@ -5,7 +5,6 @@
cc_defaults {
name: "compos_key_defaults",
defaults: ["avf_build_flags_cc"],
- apex_available: ["com.android.compos"],
shared_libs: [
"libbase",
@@ -18,6 +17,7 @@
defaults: ["compos_key_defaults"],
srcs: ["compos_key.cpp"],
export_include_dirs: ["."],
+ apex_available: ["com.android.compos"],
}
cc_binary {
@@ -33,6 +33,7 @@
"libvm_payload#current",
"libbinder_ndk",
],
+ apex_available: ["com.android.compos"],
}
cc_test {
diff --git a/libs/libservice_vm_requests/Android.bp b/libs/libservice_vm_requests/Android.bp
index d87b087..4a575b2 100644
--- a/libs/libservice_vm_requests/Android.bp
+++ b/libs/libservice_vm_requests/Android.bp
@@ -9,9 +9,6 @@
defaults: ["avf_build_flags_rust"],
srcs: ["src/lib.rs"],
prefer_rlib: true,
- apex_available: [
- "com.android.virt",
- ],
no_stdlibs: true,
stdlibs: [
"libcore.rust_sysroot",
@@ -37,6 +34,9 @@
rust_library_rlib {
name: "libservice_vm_requests_nostd",
defaults: ["libservice_vm_requests_nostd_defaults"],
+ apex_available: [
+ "com.android.virt",
+ ],
}
rust_test {
diff --git a/tests/authfs/Android.bp b/tests/authfs/Android.bp
index aa814eb..4c44bb3 100644
--- a/tests/authfs/Android.bp
+++ b/tests/authfs/Android.bp
@@ -3,6 +3,7 @@
defaults: ["authfs_defaults"],
test_suites: ["general-tests"],
data: [":authfs_test_files"],
+ apex_available: ["//apex_available:platform"],
}
filegroup {