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

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

Merge "Define reboot.recovery and watchdogd.recovery" into main am: 625bf701 

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



Change-Id: I7a05bb69527cb9aa4b196e5c358b921f682ac6e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c59d10d9 625bf701

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",

}