Merge "Revert^2 "[CrashRecovery] Add module to BCP and SSCP"" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
08a4f790d3
@@ -89,6 +89,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 += \
|
||||
@@ -120,6 +127,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))
|
||||
|
Reference in New Issue
Block a user