1 files changed, 46 insertions, 21 deletions

diff --git a/current/Android.bp b/current/Android.bp
index c9d5a75..8d8a110 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,14 +1,39 @@
 // This is auto-generated. DO NOT EDIT.
 
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: [
-        "module_java_import",
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-        "module_prebuilt_systemserverclasspath_fragment",
-    ],
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+    name: "wifi_prebuilt_java_import",
+    module_type: "java_import",
+    config_namespace: "wifi_module",
+    bool_variables: ["source_build"],
+    properties: ["prefer"],
+}
+
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+    name: "wifi_prebuilt_java_sdk_library_import",
+    module_type: "java_sdk_library_import",
+    config_namespace: "wifi_module",
+    bool_variables: ["source_build"],
+    properties: ["prefer"],
+}
+
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+    name: "wifi_prebuilt_prebuilt_bootclasspath_fragment",
+    module_type: "prebuilt_bootclasspath_fragment",
+    config_namespace: "wifi_module",
+    bool_variables: ["source_build"],
+    properties: ["prefer"],
+}
+
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+    name: "wifi_prebuilt_prebuilt_systemserverclasspath_fragment",
+    module_type: "prebuilt_systemserverclasspath_fragment",
+    config_namespace: "wifi_module",
+    bool_variables: ["source_build"],
+    properties: ["prefer"],
 }
 
 package {
@@ -43,12 +68,12 @@ prebuilt_bootclasspath_fragment {
     },
 }
 
-module_prebuilt_bootclasspath_fragment {
+wifi_prebuilt_prebuilt_bootclasspath_fragment {
     name: "com.android.wifi-bootclasspath-fragment",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },
@@ -116,12 +141,12 @@ java_sdk_library_import {
     },
 }
 
-module_java_sdk_library_import {
+wifi_prebuilt_java_sdk_library_import {
     name: "framework-wifi",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },
@@ -181,12 +206,12 @@ java_import {
     jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-wifi.jar"],
 }
 
-module_java_import {
+wifi_prebuilt_java_import {
     name: "service-wifi",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },
@@ -229,12 +254,12 @@ prebuilt_systemserverclasspath_fragment {
     standalone_contents: ["wifi-module-sdk_service-wifi@current"],
 }
 
-module_prebuilt_systemserverclasspath_fragment {
+wifi_prebuilt_prebuilt_systemserverclasspath_fragment {
     name: "com.android.wifi-systemserverclasspath-fragment",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+    // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "wifi_module" is true.
     prefer: true,
     soong_config_variables: {
-        module_build_from_source: {
+        source_build: {
             prefer: false,
         },
     },