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

Commit feb6ff1e authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "init: Separate the required modules of core and recovery variants" am: 81dad902 

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

Change-Id: Iefe31940c72ba1ea88477b9ad51cd07e8c9d447e
parents 026d8758 81dad902

init/Android.bp

+18 −8
Original line number Original line Diff line number Diff line
@@ -228,17 +228,19 @@ cc_binary { 
    stem: "init",

    stem: "init",

    defaults: ["init_defaults"],

    defaults: ["init_defaults"],

    static_libs: ["libinit"],

    static_libs: ["libinit"],

    srcs: ["main.cpp"],

    symlinks: ["ueventd"],

    target: {

        platform: {

            required: [

            required: [

        "e2fsdroid",

                "init.rc",

                "init.rc",

                "ueventd.rc",

                "e2fsdroid",

                "make_f2fs",

                "mke2fs",

                "mke2fs",

                "sload_f2fs",

                "sload_f2fs",

        "make_f2fs",

        "ueventd.rc",

            ],

            ],

    srcs: ["main.cpp"],

        },

    symlinks: ["ueventd"],

    target: {

        recovery: {

        recovery: {

            cflags: ["-DRECOVERY"],

            cflags: ["-DRECOVERY"],

            exclude_static_libs: [

            exclude_static_libs: [
@@ -248,6 +250,14 @@ cc_binary { 
                "libbinder",

                "libbinder",

                "libutils",

                "libutils",

            ],

            ],

            required: [

                "init_recovery.rc",

                "ueventd.rc.recovery",

                "e2fsdroid.recovery",

                "make_f2fs.recovery",

                "mke2fs.recovery",

                "sload_f2fs.recovery",

            ],

        },

        },

    },

    },

    visibility: ["//packages/modules/Virtualization/microdroid"],

    visibility: ["//packages/modules/Virtualization/microdroid"],