Merge "Revert "Add bootcontrol HAL APEX"" into main (ac9f70ee) · Commits · e / os / android_hardware_interfaces

boot/1.1/default/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ cc_library_shared {
		srcs: ["BootControl.cpp"],

		shared_libs: [
		"libbase",
		"liblog",
		"libhidlbase",
		"libhardware",

boot/1.1/default/boot_control/Android.bp

+3 −10

Original line number	Diff line number	Diff line
		@@ -35,13 +35,14 @@ cc_defaults {
		],

		shared_libs: [
		"android.hardware.boot@1.1",
		"libbase",
		"liblog",
		],
		static_libs: [
		"libbootloader_message",
		"libfstab",
		],

		}

		cc_library_static {
		@@ -51,13 +52,7 @@ cc_library_static {
		recovery_available: true,
		vendor_available: true,

		srcs: [
		"libboot_control.cpp",
		],
		static_libs: [
		"android.hardware.boot@1.1",
		"libbase",
		],
		srcs: ["libboot_control.cpp"],
		}

		cc_library_shared {
		@@ -72,8 +67,6 @@ cc_library_shared {
		"libboot_control",
		],
		shared_libs: [
		"android.hardware.boot@1.1",
		"libbase",
		"libhardware",
		],
		}

boot/1.2/default/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ cc_library_shared {
		srcs: ["BootControl.cpp"],

		shared_libs: [
		"libbase",
		"liblog",
		"libhidlbase",
		"libhardware",

boot/aidl/default/Android.bp

+11 −59

Original line number	Diff line number	Diff line
		@@ -27,39 +27,7 @@ cc_defaults {
		name: "android.hardware.boot-service_common",
		relative_install_path: "hw",
		defaults: ["libboot_control_defaults"],
		srcs: [
		"main.cpp",
		"BootControl.cpp",
		],
		}

		cc_binary {
		name: "android.hardware.boot-service.default",
		defaults: ["android.hardware.boot-service_common"],
		vendor: true,

		stl: "c++_static",
		shared_libs: [
		"libbinder_ndk",
		"liblog",
		],
		static_libs: [
		"android.hardware.boot@1.1",
		"android.hardware.boot-V1-ndk",
		"libbase",
		"libboot_control",
		],

		installable: false, // installed in APEX
		}

		cc_binary {
		name: "android.hardware.boot-service.default_recovery",
		defaults: ["android.hardware.boot-service_common"],
		init_rc: ["android.hardware.boot-service.default_recovery.rc"],
		vintf_fragments: ["android.hardware.boot-service.default.xml"],
		recovery: true,

		shared_libs: [
		"libbase",
		"libbinder_ndk",
		@@ -69,35 +37,19 @@ cc_binary {
		static_libs: [
		"libboot_control",
		],
		srcs: ["main.cpp", "BootControl.cpp"],
		}

		prebuilt_etc {
		name: "android.hardware.boot-service.default.rc",
		src: "android.hardware.boot-service.default.rc",
		installable: false,
		}

		prebuilt_etc {
		name: "android.hardware.boot-service.default.xml",
		src: "android.hardware.boot-service.default.xml",
		sub_dir: "vintf",
		installable: false,
		}

		apex {
		name: "com.android.hardware.boot",
		cc_binary {
		name: "android.hardware.boot-service.default",
		defaults: ["android.hardware.boot-service_common"],
		init_rc: ["android.hardware.boot-service.default.rc"],
		vendor: true,
		manifest: "apex_manifest.json",
		file_contexts: "apex_file_contexts",
		key: "com.android.hardware.key",
		certificate: ":com.android.hardware.certificate",
		updatable: false,
		}

		binaries: [
		"android.hardware.boot-service.default",
		],
		prebuilts: [
		"android.hardware.boot-service.default.rc",
		"android.hardware.boot-service.default.xml",
		],
		cc_binary {
		name: "android.hardware.boot-service.default_recovery",
		defaults: ["android.hardware.boot-service_common"],
		init_rc: ["android.hardware.boot-service.default_recovery.rc"],
		recovery: true,
		}

boot/aidl/default/android.hardware.boot-service.default.rc

+1 −1

Original line number	Diff line number	Diff line
		service vendor.boot-default /apex/com.android.hardware.boot/bin/hw/android.hardware.boot-service.default
		service vendor.boot-default /vendor/bin/hw/android.hardware.boot-service.default
		class early_hal
		user root
		group root