commit 3d70bb0a5de207a446f71db5687951a45e46a242
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 15 11:43:29 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 15 11:43:29 2023 +0000
tree 8334c4a0f81d650219f8303de317da383f865ccb
parent c988c576445819fc8d0efddf537744c68944ec41
parent ed0743daac4104dcfbfd781a2d6b298b21e6d038

Merge "Revert "[CrashRecovery] Add module lib to Android SDK"" into main

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index 15b10a6..bd2b11a 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -83,7 +83,6 @@
         "framework-configinfrastructure",
         "framework-connectivity",
         "framework-connectivity-t",
-        "framework-crashrecovery",
         "framework-devicelock",
         "framework-graphics",
         "framework-healthfitness",
@@ -106,7 +105,6 @@
     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 b33fab6..8a3d35e 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -84,10 +84,6 @@
             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",
         },