Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c949ece6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rewrite `init_vendor` using select syntax" into main am: 69833ff0 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3137397



Change-Id: I56833a2869ef17372fc7556a8c183d9b2b8c73db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e036674 69833ff0

init/Android.bp

+5 −17
Original line number Diff line number Diff line
@@ -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"],

    }),

}