Activity recognition lib name fix

The patch fixes the activity recognition library name.

Change-Id: I3522de55dd444bbe3051966bdc499bd41b9896f3
Signed-off-by: Viorel Suman <viorel.suman@intel.com>

diff --git a/Android.mk b/Android.mk
index 198fd7a..a4f1bb8 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -55,7 +55,7 @@ endif
 
 # Activity HAL module implementation
 
-ifeq ($(USE_INTEL_ACTIVITY_RECOGNITION_HAL),true)
+ifeq ($(USE_IIO_ACTIVITY_RECOGNITION_HAL),true)
 
 include $(CLEAR_VARS)
 
@@ -65,7 +65,7 @@ activity_src_files := $(src_path)/activity_event_entry.c \
                      $(src_path)/utils.c \
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
-LOCAL_MODULE := activity.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE := activity_recognition.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_OWNER := intel
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional

diff --git a/Makefile b/Makefile
index 1a3d398..67c2af5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-USE_INTEL_SENSOR_HAL := true
-USE_INTEL_ACTIVITY_RECOGNITION_HAL := true
+USE_IIO_SENSOR_HAL := true
+USE_IIO_ACTIVITY_RECOGNITION_HAL := true
 include Android.mk
 
 LIBHARDWARE?=../../../../hardware/libhardware/
 CFLAGS=-DLOG_TAG=\"sens\" -I$(LIBHARDWARE)include/ -I./linux -fPIC -Wall
 LDFLAGS=-ldl -lpthread -lm -lrt
 
-all: sensors.gmin.so sens activity.gmin.so activity
+all: sensors.gmin.so sens activity_recognition.gmin.so activity
 
 linux_src = linux/log.o
 
@@ -19,8 +19,8 @@ activity: activity.o $(linux_src)
 sensors.gmin.so: $(patsubst %.c,%.o,$(src_files) $(linux_src))
        cc -o $@ $^ $(LDFLAGS) -shared
 
-activity.gmin.so: $(patsubst %.c,%.o,$(activity_src_files) $(linux_src))
+activity_recognition.gmin.so: $(patsubst %.c,%.o,$(activity_src_files) $(linux_src))
        cc -o $@ $^ $(LDFLAGS) -shared
 
 clean:
-       -rm $(patsubst %.c,%.o,$(src_files) $(activity_src_files) $(linux_src) sens.c activity.c) sens sensors.gmin.so activity activity.gmin.so 2>/dev/null
+       -rm $(patsubst %.c,%.o,$(src_files) $(activity_src_files) $(linux_src) sens.c activity.c) sens sensors.gmin.so activity activity_recognition.gmin.so 2>/dev/null