diff options
| author | Hemant Sharma <hemantbeast@gmail.com> | 2017-09-08 08:35:38 +0530 |
|---|---|---|
| committer | Hemant Sharma <hemantbeast@gmail.com> | 2018-01-10 18:57:56 +0530 |
| commit | 06930fe861080ca8ef49baf8307dc42cd43aca01 (patch) | |
| tree | 5a3d6585cea058eaccdb6ac8dd6b6583fefb0a1a | |
| parent | 05a98f20bbfa31f565899add97ca335e8c4dda55 (diff) | |
armani: sensors: Adjust for our usecase
* Rename hals.conf -> _hals.conf so legitimate
MultiHAL won't attempt to load our HALs.
* Rename multihal -> multihal-armani so soong
doesn't complain about duplicate package names.
* Remove USE_SENSOR_MULTI_HAL flag requirement so
we can actually build it.
* Use TARGET_BOARD_PLATFORM variable in package
name because it's a common tree.
Change-Id: If01cff8c361c3d205cd3354c1e231858987ce446
| -rw-r--r-- | sensors/Android.bp | 2 | ||||
| -rw-r--r-- | sensors/Android.mk | 6 | ||||
| -rw-r--r-- | sensors/multihal.h | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/sensors/Android.bp b/sensors/Android.bp index 1d15065..17b2a7c 100644 --- a/sensors/Android.bp +++ b/sensors/Android.bp @@ -1,5 +1,5 @@ cc_library_static { - name: "multihal", + name: "multihal-armani", vendor: true, srcs: [ "multihal.cpp", diff --git a/sensors/Android.mk b/sensors/Android.mk index ca277e6..6edc35e 100644 --- a/sensors/Android.mk +++ b/sensors/Android.mk @@ -16,11 +16,9 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(USE_SENSOR_MULTI_HAL),true) - include $(CLEAR_VARS) -LOCAL_MODULE := sensors.$(TARGET_DEVICE) +LOCAL_MODULE := sensors.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_PROPRIETARY_MODULE := true @@ -41,6 +39,4 @@ LOCAL_STRIP_MODULE := false include $(BUILD_SHARED_LIBRARY) -endif # USE_SENSOR_MULTI_HAL - include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/sensors/multihal.h b/sensors/multihal.h index 234f2f0..e4fbe7e 100644 --- a/sensors/multihal.h +++ b/sensors/multihal.h @@ -19,10 +19,10 @@ #include <hardware/sensors.h> #include <hardware/hardware.h> -static const char* MULTI_HAL_CONFIG_FILE_PATH = "/vendor/etc/sensors/hals.conf"; +static const char* MULTI_HAL_CONFIG_FILE_PATH = "/vendor/etc/sensors/_hals.conf"; // Depracated because system partition HAL config file does not satisfy treble requirements. -static const char* DEPRECATED_MULTI_HAL_CONFIG_FILE_PATH = "/system/etc/sensors/hals.conf"; +static const char* DEPRECATED_MULTI_HAL_CONFIG_FILE_PATH = "/system/etc/sensors/_hals.conf"; struct sensors_module_t *get_multi_hal_module_info(void); |