diff --git a/init/Android.bp b/init/Android.bp index 6526a934e..7b7a856e9 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -664,22 +664,10 @@ sh_binary { filename_from_src: true, } -soong_config_module_type { - name: "board_use_recovery_as_boot_phony", - module_type: "phony", - config_namespace: "ANDROID", - bool_variables: ["BOARD_USES_RECOVERY_AS_BOOT"], - properties: ["required"], -} - -board_use_recovery_as_boot_phony { +phony { name: "init_vendor", - soong_config_variables: { - BOARD_USES_RECOVERY_AS_BOOT: { - required: [], - conditions_default: { - required: ["init_first_stage"], - }, - }, - }, + required: select(soong_config_variable("ANDROID", "BOARD_USES_RECOVERY_AS_BOOT"), { + true: [], + default: ["init_first_stage"], + }), }