Merge changes I779bbc77,Iefbd4181
* changes:
Send atoms via VirtualizationServiceInternal
virtualizationservice: Fix race in monitor_vm_exit
diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index 5ed7bd6..2912c91 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -24,7 +24,6 @@
"libvmbase",
"libzeroize_nostd",
],
- apex_available: ["com.android.virt"],
}
cc_binary {
@@ -40,7 +39,15 @@
"image.ld",
":vmbase_sections",
],
- apex_available: ["com.android.virt"],
+ // `installable: false` is inherited from vmbase_elf_defaults, and that
+ // hides this module from Make, which makes it impossible for the Make world
+ // to place the unstripped binary to the symbols directory. Marking back as
+ // installable exposes this module to the Make world again. Note that this
+ // module (pvmfw) still is NOT installed to any of the filesystem images. It
+ // is fed into pvmfw_bin and then into pvmfw_img to become a standalone
+ // partition image. This is just to package the unstripped file into the
+ // symbols zip file for debugging purpose.
+ installable: true,
}
raw_binary {