diff --git a/init/Android.bp b/init/Android.bp index f0e362c85..f6f1e8c8c 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -308,7 +308,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", "BOARD_USES_RECOVERY_AS_BOOT"], + bool_variables: ["BOARD_USES_RECOVERY_AS_BOOT"], properties: ["installable"], } @@ -317,9 +317,6 @@ soong_config_module_type { init_first_stage_cc_defaults { name: "init_first_stage_defaults", soong_config_variables: { - 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 c08fe0393..4b85c15ea 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -8,11 +8,9 @@ LOCAL_MODULE := init_vendor 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)