commit 7b6a18c4bd9d195f2e0da5469c0d56751cd4dd51
author Harshit Mahajan <harshitmahajan@google.com> Tue Dec 12 06:28:48 2023 +0000
committer Harshit Mahajan <harshitmahajan@google.com> Wed Jan 17 15:01:24 2024 +0000
tree 8f132618d15e0eddc8c01e7f88f8ef60a38794c5
parent 0562b343d1470da6441708570eeec752f8baeed8

Revert^2 "[CrashRecovery] Add module to BCP and SSCP"

1b22a8e7dd3a8c68a1f9938cd80f76dcdf876749

Bug: b/289203818
Test: m
Change-Id: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6fd59d9..6ae8b0d 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -199,3 +199,7 @@
 $(call add_soong_config_var_value,ANDROID,include_nonpublic_framework_api,true)
 endif
 
+# Add crashrecovery build flag to soong
+$(call soong_config_set,ANDROID,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))
+# Weirdly required because platform_bootclasspath is using AUTO namespace
+$(call soong_config_set,AUTO,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 1a30fb7..9b321d9 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -287,6 +287,13 @@
     wifi.rc \
     wm \
 
+# When we release crashrecovery module
+ifeq ($(RELEASE_CRASHRECOVERY_MODULE),true)
+  PRODUCT_PACKAGES += \
+        com.android.crashrecovery \
+
+endif
+
 # These packages are not used on Android TV
 ifneq ($(PRODUCT_IS_ATV),true)
   PRODUCT_PACKAGES += \

target/product/default_art_config.mk

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index de2a9fc..2fd7209 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -87,6 +87,13 @@
     com.android.virt:framework-virtualization \
     com.android.wifi:framework-wifi \
 
+# When we release crashrecovery module
+ifeq ($(RELEASE_CRASHRECOVERY_MODULE),true)
+  PRODUCT_APEX_BOOT_JARS += \
+        com.android.crashrecovery:framework-crashrecovery \
+
+endif
+
 # Check if the build supports NFC apex or not
 ifeq ($(RELEASE_PACKAGE_NFC_STACK),NfcNci)
     PRODUCT_BOOT_JARS += \
@@ -117,6 +124,13 @@
     com.android.permission:service-permission \
     com.android.rkpd:service-rkp \
 
+# When we release crashrecovery module
+ifeq ($(RELEASE_CRASHRECOVERY_MODULE),true)
+  PRODUCT_APEX_SYSTEM_SERVER_JARS += \
+        com.android.crashrecovery:service-crashrecovery \
+
+endif
+
 # Use $(wildcard) to avoid referencing the profile in thin manifests that don't have the
 # art project.
 ifneq (,$(wildcard art))