From a32091cf1c5c7572228d3dc5971a2142f42c4ede Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Thu, 15 Jul 2021 13:32:13 +0100
Subject: [PATCH] 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
Merged-In: I0f28f57de6de7101dfbb2112451d4da24a7d8295
Change-Id: I0f28f57de6de7101dfbb2112451d4da24a7d8295
---
 Android.bp | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/Android.bp b/Android.bp
index da69f7d..0f1a0bf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -99,3 +99,43 @@ soong_config_module_type {
         "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",
+    ],
+}