Merge "Add SubHal header for Sensors HAL 2.1" into rvc-dev (b077c21d) · Commits · e / os / android_hardware_interfaces

sensors/2.0/multihal/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ cc_binary {
		shared_libs: [
		"android.hardware.sensors@2.0",
		"android.hardware.sensors@2.0-ScopedWakelock",
		"android.hardware.sensors@2.1",
		"libbase",
		"libcutils",
		"libfmq",

sensors/common/default/2.X/multihal/Android.bp

+24 −2

Original line number	Diff line number	Diff line
		@@ -16,11 +16,12 @@
		cc_defaults {
		name: "android.hardware.sensors@2.X-multihal-defaults",
		header_libs: [
		"android.hardware.sensors@2.0-multihal.header",
		"android.hardware.sensors@2.X-multihal.header",
		],
		shared_libs: [
		"android.hardware.sensors@1.0",
		"android.hardware.sensors@2.0",
		"android.hardware.sensors@2.1",
		"libbase",
		"libcutils",
		"libfmq",
		@@ -32,9 +33,24 @@ cc_defaults {
		cflags: ["-DLOG_TAG=\"SensorsMultiHal\""],
		}

		// Header target for sub-HALs that implement the Multi-HAL 2.0 interface
		cc_library_headers {
		name: "android.hardware.sensors@2.0-multihal.header",
		vendor_available: true,
		export_include_dirs: ["include/V2_0"],
		}

		// Header target for sub-HALs that implement the Multi-HAL 2.1 interface
		cc_library_headers {
		name: "android.hardware.sensors@2.1-multihal.header",
		vendor_available: true,
		export_include_dirs: ["include/V2_1"],
		}

		// Header target for Multi-HAL so it can reference both 2.0/2.1 headers
		cc_library_headers {
		name: "android.hardware.sensors@2.X-multihal.header",
		vendor_available: true,
		export_include_dirs: ["include"],
		}

		@@ -49,7 +65,7 @@ cc_library_static {
		],
		vendor_available: true,
		export_header_lib_headers: [
		"android.hardware.sensors@2.0-multihal.header",
		"android.hardware.sensors@2.X-multihal.header",
		],
		}

		@@ -62,6 +78,9 @@ cc_library_shared {
		srcs: [
		"ScopedWakelock.cpp",
		],
		header_libs: [
		"android.hardware.sensors@2.0-multihal.header",
		],
		vendor_available: true,
		export_header_lib_headers: [
		"android.hardware.sensors@2.0-multihal.header",
		@@ -78,6 +97,9 @@ cc_test_library {
		"ScopedWakelock.cpp",
		],
		vendor_available: true,
		header_libs: [
		"android.hardware.sensors@2.0-multihal.header",
		],
		export_header_lib_headers: [
		"android.hardware.sensors@2.0-multihal.header",
		],

sensors/common/default/2.X/multihal/HalProxy.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		#include "HalProxy.h"

		#include "SubHal.h"

		#include <android/hardware/sensors/2.0/types.h>

		#include <android-base/file.h>

sensors/common/default/2.X/multihal/ScopedWakelock.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		#include "ScopedWakelock.h"
		#include "V2_0/ScopedWakelock.h"

		namespace android {
		namespace hardware {

sensors/common/default/2.X/multihal/include/HalProxy.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,9 @@

		#pragma once

		#include "ScopedWakelock.h"
		#include "SubHal.h"
		#include "V2_0/ScopedWakelock.h"
		#include "V2_0/SubHal.h"
		#include "V2_1/SubHal.h"

		#include <android/hardware/sensors/2.0/ISensors.h>
		#include <android/hardware/sensors/2.0/types.h>