[Activity HAL] Separation of common macros

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

diff --git a/Android.mk b/Android.mk
index a420fbf..5021cdb 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,11 @@
 #
-# 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)
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -18,18 +20,32 @@ src_files := $(src_path)/entry.c \
             $(src_path)/compass-calibration.c \
             $(src_path)/matrix-ops.c \
             $(src_path)/gyro-calibration.c \
+            $(src_path)/filtering.c \
+            $(src_path)/discovery.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_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
 LOCAL_LDFLAGS := -Wl,--gc-sections
-LOCAL_LDLIBS := -lpthreads
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_PRELINK_MODULE := false
 LOCAL_SRC_FILES := $(src_files)
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+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 := sens.c
+LOCAL_MODULE_TAGS := eng
+include $(BUILD_EXECUTABLE)
+endif