From d9199eb8edd464ca056dc0a14e60dd79cd5a8103 Mon Sep 17 00:00:00 2001 From: Harshit Mahajan Date: Mon, 23 Oct 2023 20:23:14 +0000 Subject: [PATCH] Revert "[CrashRecovery] Add module to BCP and SSCP" Revert submission 24444827-crashrecovery Reason for revert: Since the module is not behind any flags, it is getting included in 24Q1 Beta release. Reverted changes: /q/submissionid:24444827-crashrecovery Bug: b/305826937 Change-Id: 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 a9d3f7656c..63f9f84554 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 78c45c1b47..3f2376dd4b 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -66,7 +66,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 \ @@ -95,7 +94,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 \