Merge "Revert "Remove variants of vdm flag library"" into main
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 4f58f68..af3981c 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -412,6 +412,17 @@
 cc_aconfig_library {
     name: "android.companion.virtualdevice.flags-aconfig-cc",
     aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
+}
+
+cc_aconfig_library {
+    name: "android.companion.virtualdevice.flags-aconfig-cc-host",
+    aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
+    host_supported: true,
+}
+
+cc_aconfig_library {
+    name: "android.companion.virtualdevice.flags-aconfig-cc-test",
+    aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
     host_supported: true,
     mode: "test",
 }