diff options
| author | 2023-10-18 18:19:23 +0000 | |
|---|---|---|
| committer | 2023-10-18 18:19:23 +0000 | |
| commit | a9f792dc0da4c04adfefd91c1b7c54ccdd9ac0a1 (patch) | |
| tree | 4e740f78cb7c37376798c5347f6be7e3d1dc1b25 | |
| parent | 1d0370e48be20ea8704a50822c2efe43a60c92e6 (diff) | |
| parent | 012155323bb730ce6c5a8bcf931987ca00544da7 (diff) | |
Merge "[CrashRecovery] Add module lib to Android SDK" into main am: 4b2f12ca3e am: 012155323b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2754705
Change-Id: Ic554a27ada19f9561f4e694bba15e0f030639a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | api/Android.bp | 2 | ||||
| -rw-r--r-- | boot/Android.bp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/Android.bp b/api/Android.bp index c16bce5a1aea..e9cc40513221 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -83,6 +83,7 @@ combined_apis { "framework-configinfrastructure", "framework-connectivity", "framework-connectivity-t", + "framework-crashrecovery", "framework-devicelock", "framework-graphics", "framework-healthfitness", @@ -104,6 +105,7 @@ combined_apis { system_server_classpath: [ "service-art", "service-configinfrastructure", + "service-crashrecovery", "service-healthfitness", "service-media-s", "service-permission", diff --git a/boot/Android.bp b/boot/Android.bp index 8a3d35e2d0eb..b33fab6e1a9f 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -84,6 +84,10 @@ custom_platform_bootclasspath { module: "com.android.conscrypt-bootclasspath-fragment", }, { + apex: "com.android.crashrecovery", + module: "com.android.crashrecovery-bootclasspath-fragment", + }, + { apex: "com.android.devicelock", module: "com.android.devicelock-bootclasspath-fragment", }, |