From 1b22a8e7dd3a8c68a1f9938cd80f76dcdf876749 Mon Sep 17 00:00:00 2001 From: Harshit Mahajan Date: Wed, 15 Nov 2023 07:39:58 +0000 Subject: [PATCH] Revert "[CrashRecovery] Add module to BCP and SSCP" 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: I2cbe26499ad5ce938db7cdd3ebaf9c2e48982de9 Merged-In: I39dfab62897d907023720b594d6929397403d314 --- target/product/base_system.mk | 1 - target/product/default_art_config.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 9f57d86d64..aa0800240b 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -53,7 +53,6 @@ PRODUCT_PACKAGES += \ com.android.btservices \ com.android.configinfrastructure \ com.android.conscrypt \ - com.android.crashrecovery \ com.android.devicelock \ com.android.extservices \ com.android.healthfitness \ diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index f7c92aaa0d..04e974898a 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -65,7 +65,6 @@ PRODUCT_APEX_BOOT_JARS := \ com.android.btservices:framework-bluetooth \ com.android.configinfrastructure:framework-configinfrastructure \ com.android.conscrypt:conscrypt \ - com.android.crashrecovery:framework-crashrecovery \ com.android.devicelock:framework-devicelock \ com.android.healthfitness:framework-healthfitness \ com.android.i18n:core-icu4j \ @@ -94,7 +93,6 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \ com.android.appsearch:service-appsearch \ com.android.art:service-art \ com.android.configinfrastructure:service-configinfrastructure \ - com.android.crashrecovery:service-crashrecovery \ com.android.healthfitness:service-healthfitness \ com.android.media:service-media-s \ com.android.ondevicepersonalization:service-ondevicepersonalization \