StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
1b22a8e7dd

Bug: b/289203818
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:7b6a18c4bd9d195f2e0da5469c0d56751cd4dd51)
Merged-In: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
Change-Id: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
This commit is contained in:
Harshit Mahajan
2023-12-12 06:28:48 +00:00
parent 590bfc625c
commit f39abd6ceb
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/android_soong_config_vars.mk
View File

@@ -232,3 +232,7 @@ else
$(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))

7
target/product/base_system.mk
View File

@@ -293,6 +293,13 @@ PRODUCT_PACKAGES += \
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 += \

14
target/product/default_art_config.mk
View File

@@ -88,6 +88,13 @@ PRODUCT_APEX_BOOT_JARS := \
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 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
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))