diff options
| author | 2024-10-31 12:24:31 +0000 | |
|---|---|---|
| committer | 2024-10-31 12:24:31 +0000 | |
| commit | 98b44b0bf4571dff23fc4d824d8a372cd527b49a (patch) | |
| tree | 97bbd229751ace94d68cda935c031d13ed3ea00b | |
| parent | ea67e1cc22922bff54dfdc2300594991a5ffc0d6 (diff) | |
| parent | a2ff65bf3210cd1bcaf8b8fc55620c56ba4eb9a4 (diff) | |
Merge "Add CrashRecovery stubs to core services" into main
| -rw-r--r-- | services/Android.bp | 23 | ||||
| -rw-r--r-- | services/core/Android.bp | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/services/Android.bp b/services/Android.bp index f04c692c12d0..899e224c6fd7 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -188,6 +188,28 @@ art_profile_java_defaults { }, } +// Conditionally add crashrecovery stubs library +soong_config_module_type { + name: "crashrecovery_java_defaults", + module_type: "java_defaults", + config_namespace: "ANDROID", + bool_variables: [ + "release_crashrecovery_module", + ], + properties: [ + "libs", + ], +} + +crashrecovery_java_defaults { + name: "services_crashrecovery_stubs_conditionally", + soong_config_variables: { + release_crashrecovery_module: { + libs: ["service-crashrecovery.stubs.system_server"], + }, + }, +} + // merge all required services into one jar // ============================================================ soong_config_module_type { @@ -213,6 +235,7 @@ system_java_library { defaults: [ "services_java_defaults", "art_profile_java_defaults", + "services_crashrecovery_stubs_conditionally", ], installable: true, diff --git a/services/core/Android.bp b/services/core/Android.bp index 348d83fea81d..6cfd44bb2d1a 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -126,6 +126,7 @@ java_library_static { "platform_service_defaults", "android.hardware.power-java_shared", "latest_android_hardware_broadcastradio_java_static", + "services_crashrecovery_stubs_conditionally", ], srcs: [ ":android.hardware.tv.hdmi.connection-V1-java-source", |