Merge "Introduce microdroid variants of init_first_stage and init_second_stage" (2032b2f6) · Commits · e / os / android_system_core

init/Android.bp

+27 −6

Original line number	Diff line number	Diff line
		@@ -265,8 +265,8 @@ phony {
		],
		}

		cc_binary {
		name: "init_second_stage",
		cc_defaults {
		name: "init_second_stage_defaults",
		recovery_available: true,
		stem: "init",
		defaults: ["init_defaults"],
		@@ -304,9 +304,22 @@ cc_binary {
		],
		},
		},
		}

		cc_binary {
		name: "init_second_stage",
		defaults: ["init_second_stage_defaults"],
		}

		cc_binary {
		name: "init_second_stage.microdroid",
		defaults: ["init_second_stage_defaults"],
		cflags: ["-DMICRODROID"],
		installable: false,
		visibility: ["//packages/modules/Virtualization/microdroid"],
		}


		soong_config_module_type {
		name: "init_first_stage_cc_defaults",
		module_type: "cc_defaults",
		@@ -324,12 +337,8 @@ init_first_stage_cc_defaults {
		installable: false,
		},
		},
		}

		cc_binary {
		name: "init_first_stage",
		stem: "init",
		defaults: ["init_first_stage_defaults"],

		srcs: [
		"block_dev_initializer.cpp",
		@@ -443,6 +452,18 @@ cc_binary {
		install_in_root: true,
		}

		cc_binary {
		name: "init_first_stage",
		defaults: ["init_first_stage_defaults"],
		}

		cc_binary {
		name: "init_first_stage.microdroid",
		defaults: ["init_first_stage_defaults"],
		cflags: ["-DMICRODROID"],
		installable: false,
		}

		phony {
		name: "init_system",
		required: ["init_second_stage"],