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

Commit 2e581b68 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Define reboot.recovery and watchdogd.recovery 

By removing the "recovery_available" property from "reboot" and
"watchdogd" modules.
"recovery_available" property should be used to allow the reverse
dependencies recovery modules to depend on the module, not to
install the module to the recovery partition.

Test: m soong_generated_recovery_filesystem_test
Bug: 381888358
Change-Id: I48014774714957885f3ad648ac302cc3c13687ae
parent e74001be

reboot/Android.bp

+18 −3
Original line number Diff line number Diff line
@@ -4,10 +4,25 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



cc_binary {

    name: "reboot",

cc_defaults {

    name: "reboot_defaults",

    srcs: ["reboot.c"],

    shared_libs: ["libcutils"],

    cflags: ["-Werror"],

    recovery_available: true,

}



cc_binary {

    name: "reboot",

    defaults: [

        "reboot_defaults",

    ],

}



cc_binary {

    name: "reboot.recovery",

    defaults: [

        "reboot_defaults",

    ],

    recovery: true,

    stem: "reboot",

}

watchdogd/Android.bp

+18 −3
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



cc_binary {

    name: "watchdogd",

    recovery_available: true,

cc_defaults {

    name: "watchdogd_defaults",

    srcs: ["watchdogd.cpp"],

    cflags: [

        "-Wall",
@@ -16,3 +15,19 @@ cc_binary { 
        misc_undefined: ["signed-integer-overflow"],

    },

}



cc_binary {

    name: "watchdogd",

    defaults: [

        "watchdogd_defaults",

    ],

}



cc_binary {

    name: "watchdogd.recovery",

    defaults: [

        "watchdogd_defaults",

    ],

    recovery: true,

    stem: "watchdogd",

}