Merge "Revert^2 "[CrashRecovery] Add module to BCP and SSCP"" into main (46dfb868) · Commits · e / os / android_build

core/android_soong_config_vars.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -199,3 +199,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))
		# Weirdly required because platform_bootclasspath is using AUTO namespace
		$(call soong_config_set,AUTO,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))

+7 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,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 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,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 += \
		@@ -117,6 +124,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))