From e0168afe774d79db88053fdcbe933fb7d7bf196d Mon Sep 17 00:00:00 2001
From: Harshit Mahajan <harshitmahajan@google.com>
Date: Tue, 15 Aug 2023 14:13:23 +0000
Subject: [PATCH] [CrashRecovery] Add module lib to Android SDK

Adding the module libraries to combined_apis for them to be added to
Android SDK.
Also adding bootclasspath-fragment to platform-bootclasspath.

Bug: b/289203818
Test: m

Change-Id: Ica9b0bddc2f9cb6621a01dcd3859c39357144b5f
---
 api/Android.bp  | 2 ++
 boot/Android.bp | 4 ++++
 2 files changed, 6 insertions(+)

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 83a46c522317..93d425e439a9 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -83,6 +83,10 @@ custom_platform_bootclasspath {
             apex: "com.android.conscrypt",
             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",
-- 
GitLab