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

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

Browse Source
This commit is contained in:
Harshit Mahajan
2024-02-02 10:58:17 +00:00
committed by Android (Google) Code Review
parent 81fde978af f39abd6ceb
commit 08a4f790d3
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) $(call add_soong_config_var_value,ANDROID,include_nonpublic_framework_api,true)
endif 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

@@ -295,6 +295,13 @@ PRODUCT_PACKAGES += \
wifi.rc \ wifi.rc \
wm \ 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 # These packages are not used on Android TV
ifneq ($(PRODUCT_IS_ATV),true) ifneq ($(PRODUCT_IS_ATV),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

14
target/product/default_art_config.mk
View File

@@ -89,6 +89,13 @@ PRODUCT_APEX_BOOT_JARS := \
com.android.virt:framework-virtualization \ com.android.virt:framework-virtualization \
com.android.wifi:framework-wifi \ 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 # Check if the build supports NFC apex or not
ifeq ($(RELEASE_PACKAGE_NFC_STACK),NfcNci) ifeq ($(RELEASE_PACKAGE_NFC_STACK),NfcNci)
PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \
@@ -120,6 +127,13 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
com.android.permission:service-permission \ com.android.permission:service-permission \
com.android.rkpd:service-rkp \ 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 # Use $(wildcard) to avoid referencing the profile in thin manifests that don't have the
# art project. # art project.
ifneq (,$(wildcard art)) ifneq (,$(wildcard art))