diff --git a/init/Android.bp b/init/Android.bp index 7a4916ea2..d0b58caf7 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -257,7 +257,7 @@ soong_config_module_type { name: "init_first_stage_cc_defaults", module_type: "cc_defaults", config_namespace: "ANDROID", - bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE"], + bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE", "BOARD_USES_RECOVERY_AS_BOOT"], properties: ["installable"], } @@ -269,6 +269,9 @@ init_first_stage_cc_defaults { BOARD_BUILD_SYSTEM_ROOT_IMAGE: { installable: false, }, + BOARD_USES_RECOVERY_AS_BOOT: { + installable: false, + }, }, } diff --git a/init/Android.mk b/init/Android.mk index c1b0cf9d2..c08fe0393 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -9,8 +9,10 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) +ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true) LOCAL_REQUIRED_MODULES := \ init_first_stage \ +endif # BOARD_USES_RECOVERY_AS_BOOT endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE include $(BUILD_PHONY_PACKAGE)