X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=Android.mk;h=c23567f96fd53a7414a534ec74bf23c7ed9c166a;hb=3d94158c5cb05868a1a3a46e53fe60ba843b0079;hp=df4f36e644b90fd9c0b9372ff896f9c1a3538b8e;hpb=83d771c5932d0600eb92f931fae0bc23440b5afe;p=android-x86%2Fhardware-intel-libsensors.git

diff --git a/Android.mk b/Android.mk
index df4f36e..c23567f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2014 Intel Corporation.
+# Copyright (C) 2014-2015 Intel Corporation.
 #
 
 # 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,9 +21,15 @@ 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)
+LOCAL_MODULE := iio-sensors-hal
+else
 LOCAL_MODULE := sensors.$(TARGET_BOARD_PLATFORM)
+endif
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
@@ -32,17 +38,54 @@ LOCAL_LDFLAGS := -Wl,--gc-sections
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_PRELINK_MODULE := false
 LOCAL_SRC_FILES := $(src_files)
-
+LOCAL_PROPRIETARY_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-src_path := .
-src_files := $(src_path)/sens.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
 LOCAL_MODULE := sens
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
-LOCAL_SRC_FILES := $(src_files)
+LOCAL_SRC_FILES := sens.c
+LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
+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)
+LOCAL_PROPRIETARY_MODULE := true
+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
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_EXECUTABLE)
+
 endif