diff options
| author | 2024-01-19 16:20:35 +0000 | |
|---|---|---|
| committer | 2024-01-19 16:20:35 +0000 | |
| commit | b87d24f321dd135eaa84cffe89c33e492f4bc9af (patch) | |
| tree | c86d5229273558fb67a5b628568569baf3e12cbd | |
| parent | 4e49a6c2e87b6e3414ef970aa80adb07cf8418ab (diff) | |
| parent | 1f4501f6c05e4ee197cdd68dc026b6f3af830a9d (diff) | |
Merge "Revert^2 "[CrashRecovery] Add module lib to Android SDK"" into main
| -rw-r--r-- | api/Android.bp | 32 | ||||
| -rw-r--r-- | boot/Android.bp | 10 |
2 files changed, 42 insertions, 0 deletions
diff --git a/api/Android.bp b/api/Android.bp index 00841264c0f1..7dd13e3f8a09 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -69,8 +69,40 @@ genrule { visibility: ["//visibility:public"], } +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", diff --git a/boot/Android.bp b/boot/Android.bp index 8a3d35e2d0eb..4b3ad655d36b 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -29,6 +29,7 @@ soong_config_module_type { config_namespace: "AUTO", bool_variables: [ "car_bootclasspath_fragment", + "release_crashrecovery_module", ], properties: [ "fragments", @@ -155,6 +156,15 @@ custom_platform_bootclasspath { }, ], }, + release_crashrecovery_module: { + fragments: [ + // only used when crashrecovery is enabled + { + apex: "com.android.crashrecovery", + module: "com.android.crashrecovery-bootclasspath-fragment", + }, + ], + }, }, // Additional information needed by hidden api processing. |