Merge changes from topic "multihal_2_1" into rvc-dev am: 89b216690c am: f3660d09f7 (a1ff0219) · Commits · e / os / android_hardware_interfaces

sensors/2.0/multihal/Android.bp

+7 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ cc_binary {
		],
		init_rc: ["android.hardware.sensors@2.0-service-multihal.rc"],
		vintf_fragments: ["android.hardware.sensors@2.0-multihal.xml"],
		header_libs: [
		"android.hardware.sensors@2.X-shared-utils",
		],
		shared_libs: [
		"android.hardware.sensors@2.0",
		"android.hardware.sensors@2.0-ScopedWakelock",
		@@ -37,5 +40,8 @@ cc_binary {
		"libpower",
		"libutils",
		],
		static_libs: ["android.hardware.sensors@2.X-multihal"],
		static_libs: [
		"android.hardware.sensors@1.0-convert",
		"android.hardware.sensors@2.X-multihal",
		],
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,12 +23,12 @@
		using android::hardware::configureRpcThreadpool;
		using android::hardware::joinRpcThreadpool;
		using android::hardware::sensors::V2_0::ISensors;
		using android::hardware::sensors::V2_0::implementation::HalProxy;
		using android::hardware::sensors::V2_1::implementation::HalProxyV2_0;

		int main(int /* argc /, char* /* argv */) {
		configureRpcThreadpool(1, true);

		android::sp<ISensors> halProxy = new HalProxy();
		android::sp<ISensors> halProxy = new HalProxyV2_0();
		if (halProxy->registerAsService() != ::android::OK) {
		ALOGE("Failed to register Sensors HAL instance");
		return -1;

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		//
		// Copyright (C) 2020 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		cc_binary {
		name: "android.hardware.sensors@2.1-service.multihal",
		defaults: [
		"hidl_defaults",
		],
		vendor: true,
		relative_install_path: "hw",
		srcs: [
		"service.cpp",
		],
		init_rc: ["android.hardware.sensors@2.1-service-multihal.rc"],
		vintf_fragments: ["android.hardware.sensors@2.1-multihal.xml"],
		header_libs: [
		"android.hardware.sensors@2.X-shared-utils",
		],
		shared_libs: [
		"android.hardware.sensors@2.0",
		"android.hardware.sensors@2.0-ScopedWakelock",
		"android.hardware.sensors@2.1",
		"libbase",
		"libcutils",
		"libfmq",
		"libhidlbase",
		"liblog",
		"libpower",
		"libutils",
		],
		static_libs: [
		"android.hardware.sensors@1.0-convert",
		"android.hardware.sensors@2.X-multihal",
		],
		}

0 → 100644

+3 −0

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		<manifest version="1.0" type="device">
		<hal format="hidl">
		<name>android.hardware.sensors</name>
		<transport>hwbinder</transport>
		<version>2.1</version>
		<interface>
		<name>ISensors</name>
		<instance>default</instance>
		</interface>
		</hal>
		</manifest>