Merge "Clean up sensors hal apex" into main (2ffe33ea) · Commits · e / os / android_hardware_interfaces

sensors/aidl/default/Android.bp

+49 −20

Original line number	Diff line number	Diff line
		@@ -23,18 +23,6 @@ package {
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		filegroup {
		name: "sensors-default.rc",
		srcs: ["sensors-default.rc"],
		}

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

		cc_library_static {
		name: "libsensorsexampleimpl",
		vendor: true,
		@@ -59,21 +47,62 @@ cc_library_static {
		cc_binary {
		name: "android.hardware.sensors-service.example",
		relative_install_path: "hw",
		init_rc: [":sensors-default.rc"],
		vintf_fragments: [":sensors-default.xml"],
		installable: false, // install APEX below

		vendor: true,
		shared_libs: [
		"libbase",
		"libbinder_ndk",
		"libfmq",
		"libpower",
		"libcutils",
		"liblog",
		"libutils",
		"android.hardware.sensors-V2-ndk",
		],
		static_libs: [
		"android.hardware.common-V2-ndk",
		"android.hardware.common.fmq-V1-ndk",
		"android.hardware.sensors-V2-ndk",
		"android.system.suspend-V1-ndk",
		"libbase",
		"libcutils",
		"libfmq",
		"libpower",
		"libsensorsexampleimpl",
		"libutils",
		],
		srcs: ["main.cpp"],
		}

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

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

		// Default vendor APEX for android.hardware.sensors.
		// Custom implementations may use override_apex based on this APEX.
		apex {
		name: "com.android.hardware.sensors",
		manifest: "apex_manifest.json",
		key: "com.android.hardware.key",
		certificate: ":com.android.hardware.certificate",
		file_contexts: "file_contexts",
		updatable: false,
		vendor: true,

		binaries: ["android.hardware.sensors-service.example"],
		prebuilts: [
		"sensors-default.rc", // init rc
		"sensors-default.xml", // vintf fragment
		"android.hardware.sensor.ambient_temperature.prebuilt.xml",
		"android.hardware.sensor.barometer.prebuilt.xml",
		"android.hardware.sensor.gyroscope.prebuilt.xml",
		"android.hardware.sensor.hinge_angle.prebuilt.xml",
		"android.hardware.sensor.light.prebuilt.xml",
		"android.hardware.sensor.proximity.prebuilt.xml",
		"android.hardware.sensor.relative_humidity.prebuilt.xml",
		],
		}

sensors/aidl/default/apex/Android.bp

deleted100644 → 0

+0 −41

Original line number	Diff line number	Diff line
		package {
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		genrule {
		name: "com.android.hardware.sensors.rc-gen",
		srcs: [":sensors-default.rc"],
		out: ["com.android.hardware.sensors.rc"],
		cmd: "sed -E 's/\\/vendor/\\/apex\\/com.android.hardware.sensors/' $(in) > $(out)",
		}

		prebuilt_etc {
		name: "com.android.hardware.sensors.rc",
		src: ":com.android.hardware.sensors.rc-gen",
		installable: false,
		}

		// Default vendor APEX for android.hardware.sensors.
		// Custom implementations may use override_apex based on this APEX.
		apex {
		name: "com.android.hardware.sensors",
		manifest: "apex_manifest.json",
		key: "com.android.hardware.key",
		certificate: ":com.android.hardware.certificate",
		file_contexts: "file_contexts",
		updatable: false,
		vendor: true,

		binaries: ["android.hardware.sensors-service.example"],
		prebuilts: [
		"com.android.hardware.sensors.rc", // init rc
		"sensors-default.xml", // vintf fragment
		"android.hardware.sensor.ambient_temperature.prebuilt.xml",
		"android.hardware.sensor.barometer.prebuilt.xml",
		"android.hardware.sensor.gyroscope.prebuilt.xml",
		"android.hardware.sensor.hinge_angle.prebuilt.xml",
		"android.hardware.sensor.light.prebuilt.xml",
		"android.hardware.sensor.proximity.prebuilt.xml",
		"android.hardware.sensor.relative_humidity.prebuilt.xml",
		],
		}

sensors/aidl/default/apex/com.android.hardware.sensors.avbpubkey

deleted100644 → 0

−1.01 KiB

File deleted.

View file

sensors/aidl/default/apex/com.android.hardware.sensors.pem

deleted100644 → 0

+0 −51

Original line number	Diff line number	Diff line
		-----BEGIN RSA PRIVATE KEY-----
		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
		-----END RSA PRIVATE KEY-----

sensors/aidl/default/apex/com.android.hardware.sensors.pk8

deleted100644 → 0

−2.32 KiB

File deleted.

View file