Merge "Define init_second_stage.recovery" into main (943e7a1e) · Commits · e / os / android_system_core

init/Android.bp

+32 −33

Original line number	Diff line number	Diff line
		@@ -268,7 +268,6 @@ phony {

		cc_defaults {
		name: "init_second_stage_defaults",
		recovery_available: true,
		stem: "init",
		defaults: ["init_defaults"],
		srcs: ["main.cpp"],
		@@ -280,8 +279,6 @@ cc_binary {
		defaults: ["init_second_stage_defaults"],
		static_libs: ["libinit"],
		visibility: ["//visibility:any_system_partition"],
		target: {
		platform: {
		required: [
		"init.rc",
		"ueventd.rc",
		@@ -291,8 +288,13 @@ cc_binary {
		"mke2fs",
		"sload_f2fs",
		],
		},
		recovery: {
		}

		cc_binary {
		name: "init_second_stage.recovery",
		defaults: ["init_second_stage_defaults"],
		static_libs: ["libinit"],
		recovery: true,
		cflags: ["-DRECOVERY"],
		exclude_static_libs: [
		"libxml2",
		@@ -309,8 +311,6 @@ cc_binary {
		"mke2fs.recovery",
		"sload_f2fs.recovery",
		],
		},
		},
		}

		cc_binary {
		@@ -319,7 +319,6 @@ cc_binary {
		"avf_build_flags_cc",
		"init_second_stage_defaults",
		],
		recovery_available: false,
		static_libs: ["libinit.microdroid"],
		cflags: ["-DMICRODROID=1"],
		no_full_install: true,