X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=df4f36e644b90fd9c0b9372ff896f9c1a3538b8e;hb=b24d6584ce3c44cdb5ba9ebe6aa525ff7ecd477c;hp=68f7937d35c8ce6af3ac284c780493f69fa780f2;hpb=259d5cfe043792f3549e8e765b97da1f486c3bc8;p=android-x86%2Fhardware-intel-libsensors.git

diff --git a/Android.mk b/Android.mk
index 68f7937..df4f36e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,8 @@
 
 # IIO sensors HAL module implementation, compiled as hw/iio-sensors-hal.so
 
+ifeq ($(USE_INTEL_SENSOR_HAL),true)
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -15,10 +17,15 @@ src_files := $(src_path)/entry.c \
 	     $(src_path)/description.c \
 	     $(src_path)/utils.c \
 	     $(src_path)/transform.c \
+	     $(src_path)/compass-calibration.c \
+	     $(src_path)/matrix-ops.c \
+	     $(src_path)/gyro-calibration.c \
+	     $(src_path)/filtering.c \
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors-hal
-LOCAL_MODULE := iio-sensors-hal
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
+LOCAL_MODULE := sensors.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_OWNER := intel
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
 LOCAL_LDFLAGS := -Wl,--gc-sections
@@ -28,3 +35,14 @@ LOCAL_SRC_FILES := $(src_files)
 
 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_MODULE_TAGS := eng
+include $(BUILD_EXECUTABLE)
+endif