sens: use Android.mk to get the HAL sources for the Linux build

Also, use the same name for the Linux build HAL (sensors.gmin.so).

Change-Id: I3290c6347a3746634d721367eb2b6b42d92e759e
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>

diff --git a/Android.mk b/Android.mk
index df4f36e..73d4d6d 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -36,13 +36,11 @@ 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_SRC_FILES := sens.c
 LOCAL_MODULE_TAGS := eng
 include $(BUILD_EXECUTABLE)
 endif

diff --git a/Makefile b/Makefile
index dbe8702..94334a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,19 @@
+USE_INTEL_SENSOR_HAL := true
+include Android.mk
+
 LIBHARDWARE?=../../../../hardware/libhardware/
 CFLAGS=-DLOG_TAG=\"sens\" -I$(LIBHARDWARE)include/ -I./linux -fPIC
 LDFLAGS=-ldl -lpthread -lm -lrt
 
-all: sensors-hal.so sens
+all: sensors.gmin.so sens
 
 linux_src = linux/log.o
 
 sens: sens.o $(linux_src)
        cc -o $@ $^ $(LDFLAGS)
 
-hal_src = entry.c enumeration.c control.c description.c utils.c transform.c compass-calibration.c matrix-ops.c \
-
-sensors-hal.so: $(patsubst %.c,%.o,$(hal_src) $(linux_src))
+sensors.gmin.so: $(patsubst %.c,%.o,$(src_files) $(linux_src))
        cc -o $@ $^ $(LDFLAGS) -shared
 
 clean:
-       -rm $(patsubst %.c,%.o,$(hal_src) $(linux_src) sens.c) sens sensors-hal.so 2>/dev/null
+       -rm $(patsubst %.c,%.o,$(src_files) $(linux_src) sens.c) sens sensors.gmin.so 2>/dev/null