Merge "Disable module build rules when using prebuilts." into sc-devandroid12-dev

3 files changed, 42 insertions, 3 deletions

diff --git a/apex/Android.bp b/apex/Android.bp
index d7bc4267..3401244c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,10 +16,23 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-apex {
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_apex",
+    ],
+}
+
+module_apex {
     name: "com.android.os.statsd",
     defaults: ["com.android.os.statsd-defaults"],
     manifest: "apex_manifest.json",
+    enabled: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            enabled: true,
+        },
+    },
 }
 
 apex_defaults {
diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index e5213262..5c2291ae 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -16,7 +16,14 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-apex_test {
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_apex_test",
+    ],
+}
+
+module_apex_test {
     name: "test_com.android.os.statsd",
     visibility: [
         "//system/apex/tests",
@@ -26,4 +33,10 @@ apex_test {
     file_contexts: ":com.android.os.statsd-file_contexts",
     // Test APEX, should never be installed
     installable: false,
+    enabled: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            enabled: true,
+        },
+    },
 }
diff --git a/service/Android.bp b/service/Android.bp
index f31674f4..96308af2 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -16,6 +16,13 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_java_library",
+    ],
+}
+
 filegroup {
     name: "service-statsd-sources",
     srcs: [
@@ -23,7 +30,7 @@ filegroup {
     ],
 }
 
-java_library {
+module_java_library {
     name: "service-statsd",
     srcs: [ ":service-statsd-sources" ],
     sdk_version: "system_server_current",
@@ -40,4 +47,10 @@ java_library {
         "test_com.android.os.statsd",
     ],
     min_sdk_version: "30",
+    enabled: false,
+    soong_config_variables: {
+        module_build_from_source: {
+            enabled: true,
+        },
+    },
 }