commit 20cc2938bb2e235cc4ff3a23f4b63992e0cc08c9
author Mathew Inwood <mathewi@google.com> Thu Jul 15 13:32:13 2021 +0100
committer Mathew Inwood <mathewi@google.com> Tue Jul 27 15:34:17 2021 +0000
tree 9b9fa6eabefbbe89c3e262a9256000480bef8c9c
parent d518a8d6e5ad7003889964bbee5dafa25dc53a1e

Add soong config rules for more module rules.

We need to disable some such build rules to get SDK prebuilts working to
add appropriate rules here to allow the enabled property to be
overridden.

Bug: 192556458
Test: m
Change-Id: I0f28f57de6de7101dfbb2112451d4da24a7d8295

Android.bp

diff --git a/Android.bp b/Android.bp
index ea4c251..cc4b402 100644
--- a/Android.bp
+++ b/Android.bp
@@ -109,3 +109,43 @@
         "prefer",
     ],
 }
+
+soong_config_module_type {
+    name: "module_java_library",
+    module_type: "java_library",
+    config_namespace: "ANDROID",
+    bool_variables: ["module_build_from_source"],
+    properties: [
+        "enabled",
+    ],
+}
+
+soong_config_module_type {
+    name: "module_apex",
+    module_type: "apex",
+    config_namespace: "ANDROID",
+    bool_variables: ["module_build_from_source"],
+    properties: [
+        "enabled",
+    ],
+}
+
+soong_config_module_type {
+    name: "module_apex_test",
+    module_type: "apex_test",
+    config_namespace: "ANDROID",
+    bool_variables: ["module_build_from_source"],
+    properties: [
+        "enabled",
+    ],
+}
+
+soong_config_module_type {
+    name: "module_override_apex",
+    module_type: "override_apex",
+    config_namespace: "ANDROID",
+    bool_variables: ["module_build_from_source"],
+    properties: [
+        "enabled",
+    ],
+}