From ed0743daac4104dcfbfd781a2d6b298b21e6d038 Mon Sep 17 00:00:00 2001
From: Harshit Mahajan <harshitmahajan@google.com>
Date: Wed, 15 Nov 2023 07:39:58 +0000
Subject: [PATCH] Revert "[CrashRecovery] Add module lib to Android SDK"
Revert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943
Reason for revert: Leading to merge conflict
Bug: b/311082270
Reverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943
Change-Id: Ic80afd7a8e09cf2e0cf6e453cbe004db0c9fcbd7
Merged-In: I5c65d85d50b214926f5473908694070b4e896201
---
api/Android.bp | 2 --
boot/Android.bp | 4 ----
2 files changed, 6 deletions(-)
diff --git a/api/Android.bp b/api/Android.bp
index e9cc40513221..c16bce5a1aea 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -83,7 +83,6 @@ combined_apis {
"framework-configinfrastructure",
"framework-connectivity",
"framework-connectivity-t",
- "framework-crashrecovery",
"framework-devicelock",
"framework-graphics",
"framework-healthfitness",
@@ -105,7 +104,6 @@ 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 b33fab6e1a9f..8a3d35e2d0eb 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -83,10 +83,6 @@ 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