commit e3d1ff9fbcfd9c02e08c7bec1c8043b91adcf374
author Harshit Mahajan <harshitmahajan@google.com> Fri Jul 19 13:17:54 2024 +0000
committer Harshit Mahajan <harshitmahajan@google.com> Fri Jul 19 13:46:21 2024 +0000
tree e5bb711e039cc30277b238451f535d7d9cbc40f4
parent 1ba915c168fd39a94b3670152fa8f26c55684df9

[CrashRecovery] Conditionally add module lib to Android SDK

Use soong select variable instead of combined_api_defaults which was not working as expected.

Bug: 349800749
Change-Id: Ie3567e43a47b62c96e2376de148cc6fa682cd4d1
Test: aninja -t path out/target/product/generic/obj/ETC/frameworks-base-api-current.txt_intermediates/frameworks-base-api-current.txt out/soong/.intermediates/packages/modules/CrashRecovery/framework/framework-crashrecovery.stubs.source/android_common/everything/framework-crashrecovery.stubs.source_api.txt

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index 4de3a28..4b26eb4 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -62,40 +62,8 @@
 metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "
 metalava_cmd += " --quiet "
 
-soong_config_module_type {
-    name: "enable_crashrecovery_module",
-    module_type: "combined_apis_defaults",
-    config_namespace: "ANDROID",
-    bool_variables: ["release_crashrecovery_module"],
-    properties: [
-        "bootclasspath",
-        "system_server_classpath",
-    ],
-}
-
-soong_config_bool_variable {
-    name: "release_crashrecovery_module",
-}
-
-enable_crashrecovery_module {
-    name: "crashrecovery_module_defaults",
-    soong_config_variables: {
-        release_crashrecovery_module: {
-            bootclasspath: [
-                "framework-crashrecovery",
-            ],
-            system_server_classpath: [
-                "service-crashrecovery",
-            ],
-        },
-    },
-}
-
 combined_apis {
     name: "frameworks-base-api",
-    defaults: [
-        "crashrecovery_module_defaults",
-    ],
     bootclasspath: [
         "android.net.ipsec.ike",
         "art.module.public.api",
@@ -128,7 +96,12 @@
         "framework-virtualization",
         "framework-wifi",
         "i18n.module.public.api",
-    ],
+    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
+        "true": [
+            "framework-crashrecovery",
+        ],
+        default: [],
+    }),
     system_server_classpath: [
         "service-art",
         "service-configinfrastructure",
@@ -137,7 +110,12 @@
         "service-permission",
         "service-rkp",
         "service-sdksandbox",
-    ],
+    ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
+        "true": [
+            "service-crashrecovery",
+        ],
+        default: [],
+    }),
 }
 
 genrule {