diff --git a/api/Android.bp b/api/Android.bp
index c16bce5a1aea11a78d1a8fed157225c48b4a3f06..e9cc405132211ddc66f29c87231b651c1257de2a 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 83a46c522317511e404b198364c50a8f6c2b0001..93d425e439a9353cb57ede40e809a8944239f0d5 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",