commit fc732f56f191d337e874ab3f885e30e5c1a526ba
author Jooyung Han <jooyung@google.com> Sat Jun 26 02:54:20 2021 +0900
committer Jooyung Han <jooyung@google.com> Tue Jun 29 09:48:53 2021 +0900
tree 823199c1ee36fb04cf30aa44b5c5da610429a86e
parent 9713bd4664034f4a0c2f8ffbb289bd19481d4800

Merge VM and CDISK config into libvmconfig

so that virtualizationservice and vm use it.

Bug: 190503456
Test: MicrodroidHostTestCases
Change-Id: I63eaf0ac1c6d0e1e17d19f4863c5f4f14525aa32

vm/Android.bp

diff --git a/vm/Android.bp b/vm/Android.bp
index c07beb2..734f2d3 100644
--- a/vm/Android.bp
+++ b/vm/Android.bp
@@ -10,13 +10,13 @@
     rustlibs: [
         "android.system.virtualizationservice-rust",
         "libanyhow",
-        "libcompositediskconfig",
         "libenv_logger",
         "liblibc",
         "liblog_rust",
         "libserde_json",
         "libserde",
         "libstructopt",
+        "libvmconfig",
     ],
     apex_available: [
         "com.android.virt",