commit 668d7c576a68f52f1c8c47069526ab2adf7349e9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 15 12:10:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 15 12:10:50 2023 +0000
tree 744ceb5765627aca809e64a96ff85f975c604410
parent 9876d290827aa66679caf770f8a62dfd63689f2c
parent 3d70bb0a5de207a446f71db5687951a45e46a242

Merge "Revert "[CrashRecovery] Add module lib to Android SDK"" into main am: 3d70bb0a5d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2829636

Change-Id: I1dbe972f483dd09c72c7c5f31ce8f359ae4bae77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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",
         },