diff options
| author | 2023-12-12 06:28:48 +0000 | |
|---|---|---|
| committer | 2024-01-18 11:26:09 +0000 | |
| commit | 1f4501f6c05e4ee197cdd68dc026b6f3af830a9d (patch) | |
| tree | 3133e93e8befadd83fe1de87a659424d01579d64 | |
| parent | dd7cd7c03a41302a843889bdf59d70814afe9e46 (diff) | |
Revert^2 "[CrashRecovery] Add module lib to Android SDK"
ed0743daac4104dcfbfd781a2d6b298b21e6d038
Bug:b/289203818
Test: m nothing
Change-Id: Id156c0fd4b7b783c5b9f1488914f5650e30ffed5
Merged-In: If6789fee9a908231babd7624280b40515d377dfe
| -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. |