Merge "Define reboot.recovery and watchdogd.recovery" into main (625bf701) · Commits · e / os / android_system_core

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

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