Merge "Add rebootescrow HAL into APEX" into main (3d000a3a) · Commits · e / os / android_hardware_interfaces

rebootescrow/aidl/default/Android.bp

+38 −4

Original line number	Diff line number	Diff line
		@@ -42,10 +42,10 @@ cc_library_static {

		cc_binary {
		name: "android.hardware.rebootescrow-service.default",
		init_rc: ["rebootescrow-default.rc"],
		relative_install_path: "hw",
		vintf_fragments: ["rebootescrow-default.xml"],
		vendor: true,
		installable: false, // installed in APEX

		srcs: [
		"service.cpp",
		],
		@@ -53,12 +53,14 @@ cc_binary {
		"-Wall",
		"-Werror",
		],
		stl: "c++_static",
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"android.hardware.rebootescrow-V1-ndk",
		"liblog",
		],
		static_libs: [
		"android.hardware.rebootescrow-V1-ndk",
		"libbase",
		"libhadamardutils",
		"librebootescrowdefaultimpl",
		],
		@@ -97,3 +99,35 @@ cc_test {
		],
		test_suites: ["device-tests"],
		}

		prebuilt_etc {
		name: "rebootescrow-default.rc",
		src: "rebootescrow-default.rc",
		installable: false,
		}

		prebuilt_etc {
		name: "rebootescrow-default.xml",
		src: "rebootescrow-default.xml",
		sub_dir: "vintf",
		installable: false,
		}

		apex {
		name: "com.android.hardware.rebootescrow",
		manifest: "apex_manifest.json",
		file_contexts: "apex_file_contexts",
		key: "com.android.hardware.key",
		certificate: ":com.android.hardware.certificate",
		vendor: true,
		updatable: false,

		binaries: [
		"android.hardware.rebootescrow-service.default",
		],
		prebuilts: [
		"rebootescrow-default.rc",
		"rebootescrow-default.xml",
		"android.hardware.reboot_escrow.prebuilt.xml", // <feature>
		],
		}

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		(/.*)? u:object_r:vendor_file:s0
		/etc(/.*)? u:object_r:vendor_configs_file:s0
		/bin/hw/android\.hardware\.rebootescrow-service\.default u:object_r:hal_rebootescrow_default_exec:s0

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		{
		"name": "com.android.hardware.rebootescrow",
		"version": 1
		}
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		service vendor.rebootescrow-default /vendor/bin/hw/android.hardware.rebootescrow-service.default
		service vendor.rebootescrow-default /apex/com.android.hardware.rebootescrow/bin/hw/android.hardware.rebootescrow-service.default
		interface aidl android.hardware.rebootescrow.IRebootEscrow/default
		class hal
		user system