2 files changed, 15 insertions, 41 deletions
diff --git a/build/mainline_modules_sdks_test_data/art_Android.bp.expected b/build/mainline_modules_sdks_test_data/art_Android.bp.expected
index 8fc0455e..135e4e6c 100644
--- a/build/mainline_modules_sdks_test_data/art_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/art_Android.bp.expected
@@ -1,30 +1,13 @@
 // This is auto-generated. DO NOT EDIT.
 
-// Soong config variable module type added by test_art.
-soong_config_module_type {
-    name: "art_prebuilt_java_import",
-    module_type: "java_import",
-    config_namespace: "art_module",
-    bool_variables: ["source_build"],
-    properties: ["prefer"],
-}
-
-// Soong config variable module type added by test_art.
-soong_config_module_type {
-    name: "art_prebuilt_prebuilt_bootclasspath_fragment",
-    module_type: "prebuilt_bootclasspath_fragment",
-    config_namespace: "art_module",
-    bool_variables: ["source_build"],
-    properties: ["prefer"],
-}
-
-// Soong config variable module type added by test_art.
-soong_config_module_type {
-    name: "art_prebuilt_prebuilt_platform_compat_config",
-    module_type: "prebuilt_platform_compat_config",
-    config_namespace: "art_module",
-    bool_variables: ["source_build"],
-    properties: ["prefer"],
+// Soong config variable stanza added by test_art.
+soong_config_module_type_import {
+    from: "prebuilts/module_sdk/art/SoongConfig.bp",
+    module_types: [
+        "art_prebuilt_java_import",
+        "art_prebuilt_prebuilt_bootclasspath_fragment",
+        "art_prebuilt_prebuilt_platform_compat_config",
+    ],
 }
 
 package {
diff --git a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
index 1a3d3432..99640c05 100644
--- a/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
+++ b/build/mainline_modules_sdks_test_data/ipsec_Android.bp.expected
@@ -1,21 +1,12 @@
 // This is auto-generated. DO NOT EDIT.
 
-// Soong config variable module type added by test_common_mainline_module.
-soong_config_module_type {
-    name: "module_java_sdk_library_import",
-    module_type: "java_sdk_library_import",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: ["prefer"],
-}
-
-// Soong config variable module type added by test_common_mainline_module.
-soong_config_module_type {
-    name: "module_prebuilt_bootclasspath_fragment",
-    module_type: "prebuilt_bootclasspath_fragment",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: ["prefer"],
+// Soong config variable stanza added by test_common_mainline_module.
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_java_sdk_library_import",
+        "module_prebuilt_bootclasspath_fragment",
+    ],
 }
 
 package {