commit dfda72e1f3006d721d8a297f0bcfe32a295d3ad0
author Nikita Ioffe <ioffe@google.com> Mon Nov 20 14:52:52 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 20 14:52:52 2023 +0000
tree 200a77c2509ac4c0b15842323995ae048e70123a
parent f0ecad523d9058cb8684b83d63e973252fe86acb
parent 2814dd3266c27ee78b8df6eace7d9db04a743a5b

Merge "Only add vendor_a to microdroid_super if vendor modules flag is disabled" into main

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 23eadcf..c93cb4c 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -283,12 +283,14 @@
     ],
     soong_config_variables: {
         release_avf_enable_vendor_modules: {
-            default_group: [
-                {
-                    name: "vendor_a",
-                    filesystem: ":microdroid_vendor",
-                },
-            ],
+            conditions_default: {
+                default_group: [
+                    {
+                        name: "vendor_a",
+                        filesystem: ":microdroid_vendor",
+                    },
+                ],
+            },
         },
     },
 }