lineage/android_device_samsung_msm8974-common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msm8974-common: sensors: Adjust for our usecase

Browse Source 
* Rename hals.conf -> _hals.conf so legitimate
  MultiHAL won't attempt to load our HALs.
* Rename multihal -> multihal-samsung8974 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: Ifa8c20747e3f0bf9bae8b42dd4c499cf6d770e27
This commit is contained in:
LuK1337 2017-09-05 13:46:00 -04:00 committed by Kevin F. Haggerty
parent e0db06fff8
commit 3b6f6bb075
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sensors/Android.bp
View File

@ -1,5 +1,5 @@
cc_library_static { cc_library_static {
name: "multihal", name: "multihal-samsung8974",
vendor: true, vendor: true,
srcs: [ srcs: [
"multihal.cpp", "multihal.cpp",

11
sensors/Android.mk
View File

@ -16,12 +16,9 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifeq ($(USE_SENSOR_MULTI_HAL),true)
ifneq ($(PRODUCT_FULL_TREBLE),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := sensors.$(TARGET_DEVICE) LOCAL_MODULE := sensors.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true LOCAL_PROPRIETARY_MODULE := true
@ -45,10 +42,4 @@ LOCAL_STRIP_MODULE := false
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
else
$(warning Treble enabled device have built-in sensor multihal support. \
USE_SENSOR_MULTI_HAL should not be set.)
endif # PRODUCT_FULL_TREBLE
endif # USE_SENSOR_MULTI_HAL
include $(call all-makefiles-under, $(LOCAL_PATH)) include $(call all-makefiles-under, $(LOCAL_PATH))

4
sensors/multihal.h
View File

@ -19,10 +19,10 @@
#include <hardware/sensors.h> #include <hardware/sensors.h>
#include <hardware/hardware.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. // 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); struct sensors_module_t *get_multi_hal_module_info(void);