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

Commit 9ba6a5b8 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang
Browse files

init: Separate the required modules of core and recovery variants 

So that init_second_stage (core) depends on core variant tools and rc
files, and init_second_stage.recovery depends on recovery variant tools
and recovery specific rc files.

Bug: 191369319
Test: Presubmit
Test: Check the ninja graph, init_second_stage.recovery no longer depend
  on core variation modules
Test: Check out/soong/Android-${PRODUCT}.mk
Change-Id: I03f0cf6af10617fe2e7de677e9dde1aecb2afc74
parent d6ddc20d

init/Android.bp

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

    defaults: ["init_defaults"],

    static_libs: ["libinit"],

    srcs: ["main.cpp"],

    symlinks: ["ueventd"],

    target: {

        platform: {

            required: [

        "e2fsdroid",

                "init.rc",

                "ueventd.rc",

                "e2fsdroid",

                "make_f2fs",

                "mke2fs",

                "sload_f2fs",

        "make_f2fs",

        "ueventd.rc",

            ],

    srcs: ["main.cpp"],

    symlinks: ["ueventd"],

    target: {

        },

        recovery: {

            cflags: ["-DRECOVERY"],

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

                "libutils",

            ],

            required: [

                "init_recovery.rc",

                "ueventd.rc.recovery",

                "e2fsdroid.recovery",

                "make_f2fs.recovery",

                "mke2fs.recovery",

                "sload_f2fs.recovery",

            ],

        },

    },

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