Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into l...

[android-x86/hardware-intel-libsensors.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 7502a4c..a4f1bb8 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,7 @@
 
 # IIO sensors HAL module implementation, compiled as hw/iio-sensors-hal.so
 
-ifeq ($(USE_INTEL_SENSOR_HAL),true)
+ifeq ($(USE_IIO_SENSOR_HAL),true)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -21,6 +21,8 @@ src_files := $(src_path)/entry.c \
             $(src_path)/matrix-ops.c \
             $(src_path)/gyro-calibration.c \
             $(src_path)/filtering.c \
+            $(src_path)/discovery.c \
+            $(src_path)/accel-calibration.c \
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
 ifeq ($(HAL_AUTODETECT),true)
@@ -47,4 +49,41 @@ LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_SRC_FILES := sens.c
 LOCAL_MODULE_TAGS := eng
 include $(BUILD_EXECUTABLE)
+
+endif
+
+
+# Activity HAL module implementation
+
+ifeq ($(USE_IIO_ACTIVITY_RECOGNITION_HAL),true)
+
+include $(CLEAR_VARS)
+
+src_path := .
+activity_src_files := $(src_path)/activity_event_entry.c \
+                     $(src_path)/discovery.c \
+                     $(src_path)/utils.c \
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
+LOCAL_MODULE := activity_recognition.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := -DLOG_TAG=\"Activity\" -fvisibility=hidden
+LOCAL_LDFLAGS := -Wl,--gc-sections
+LOCAL_SHARED_LIBRARIES := liblog libcutils
+LOCAL_PRELINK_MODULE := false
+LOCAL_SRC_FILES := $(activity_src_files)
+
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
+LOCAL_MODULE := activity
+LOCAL_CFLAGS := -DLOG_TAG=\"Activity\" -fvisibility=hidden
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
+LOCAL_SRC_FILES := activity.c
+LOCAL_MODULE_TAGS := eng
+include $(BUILD_EXECUTABLE)
+
 endif