commit 9c3742afa1ed0923888b7f1ba69772373479f415
author Harshit Mahajan <harshitmahajan@google.com> Tue Aug 15 14:13:23 2023 +0000
committer Harshit Mahajan <harshitmahajan@google.com> Mon Oct 16 17:03:45 2023 +0000
tree de237ab547fcb5a3d481a1e38802e5229d3380b7
parent 7e44fa6c44cace0006511dea23de7e63e711ba06

[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

diff --git a/api/Android.bp b/api/Android.bp
index c16bce5..e9cc405 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -83,6 +83,7 @@
         "framework-configinfrastructure",
         "framework-connectivity",
         "framework-connectivity-t",
+        "framework-crashrecovery",
         "framework-devicelock",
         "framework-graphics",
         "framework-healthfitness",
@@ -104,6 +105,7 @@
     system_server_classpath: [
         "service-art",
         "service-configinfrastructure",
+        "service-crashrecovery",
         "service-healthfitness",
         "service-media-s",
         "service-permission",

boot/Android.bp

diff --git a/boot/Android.bp b/boot/Android.bp
index 8a3d35e..b33fab6 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -84,6 +84,10 @@
             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",
         },