Revert^2 "[CrashRecovery] Add module to BCP and SSCP"
1b22a8e7dd3a8c68a1f9938cd80f76dcdf876749
Bug: b/289203818
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:7b6a18c4bd9d195f2e0da5469c0d56751cd4dd51)
Merged-In: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
Change-Id: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 1494f68..dbb80df 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -232,3 +232,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))
+# Required as platform_bootclasspath is using this namespace
+$(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5d8fb00..1004d8c 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -293,6 +293,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 += \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 0306c58..d78864d 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -88,6 +88,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 += \
@@ -119,6 +126,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))