ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Define reboot.recovery and watchdogd.recovery

Browse source 
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
This commit is contained in:
Jihoon Kang 2024-12-06 23:18:18 +00:00
parent e74001be6f
commit 2e581b68c6
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
reboot/Android.bp
View file

@ -4,10 +4,25 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], default_applicable_licenses: ["Android-Apache-2.0"],
} }
cc_binary { cc_defaults {
name: "reboot", name: "reboot_defaults",
srcs: ["reboot.c"], srcs: ["reboot.c"],
shared_libs: ["libcutils"], shared_libs: ["libcutils"],
cflags: ["-Werror"], cflags: ["-Werror"],
recovery_available: true, }
cc_binary {
name: "reboot",
defaults: [
"reboot_defaults",
],
}
cc_binary {
name: "reboot.recovery",
defaults: [
"reboot_defaults",
],
recovery: true,
stem: "reboot",
} }

21
watchdogd/Android.bp
View file

@ -2,9 +2,8 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], default_applicable_licenses: ["Android-Apache-2.0"],
} }
cc_binary { cc_defaults {
name: "watchdogd", name: "watchdogd_defaults",
recovery_available: true,
srcs: ["watchdogd.cpp"], srcs: ["watchdogd.cpp"],
cflags: [ cflags: [
"-Wall", "-Wall",
@ -16,3 +15,19 @@ cc_binary {
misc_undefined: ["signed-integer-overflow"], misc_undefined: ["signed-integer-overflow"],
}, },
} }
cc_binary {
name: "watchdogd",
defaults: [
"watchdogd_defaults",
],
}
cc_binary {
name: "watchdogd.recovery",
defaults: [
"watchdogd_defaults",
],
recovery: true,
stem: "watchdogd",
}