1 files changed, 21 insertions, 1 deletions
diff --git a/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/shared.mk b/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/shared.mk
index 38d1fb4..8e45293 100644
--- a/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/shared.mk
+++ b/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/shared.mk
@@ -2,7 +2,18 @@ EXEC = inv_devnode_parser$(SHARED_APP_SUFFIX)
 
 MK_NAME = $(notdir $(CURDIR)/$(firstword $(MAKEFILE_LIST)))
 
-CROSS ?= $(ANDROID_ROOT)/prebuilt/linux-x86/toolchain/arm-eabi-4.4.0/bin/arm-eabi-
+# ANDROID version check
+BUILD_ANDROID_LOLLIPOP = $(shell test -d $(ANDROID_ROOT)/bionic/libc/kernel/uapi && echo 1)
+$(info YD>>BUILD_ANDROID_LOLLIPOP = $(BUILD_ANDROID_LOLLIPOP))
+#ANDROID version check END
+
+ifeq ($(BUILD_ANDROID_LOLLIPOP),1)
+CFLAGS += -DANDROID_LOLLIPOP
+else
+CFLAGS += -DANDROID_KITKAT
+endif
+
+#--yd CROSS ?= $(ANDROID_ROOT)/prebuilt/linux-x86/toolchain/arm-eabi-4.4.0/bin/arm-eabi-
 COMP  ?= $(CROSS)gcc
 LINK  ?= $(CROSS)gcc
 
@@ -17,13 +28,18 @@ include $(INV_ROOT)/software/build/android/common.mk
 CFLAGS += $(CMDLINE_CFLAGS)
 CFLAGS += $(ANDROID_COMPILE)
 CFLAGS += -Wall
+ifeq ($(BUILD_ANDROID_LOLLIPOP),1)
+else
 CFLAGS += -fpic
+endif
 CFLAGS += -nostdlib
 CFLAGS += -DNDEBUG
 CFLAGS += -D_REENTRANT
 CFLAGS += -DLINUX
 CFLAGS += -DANDROID
+ifeq ($(ARCH),arm)
 CFLAGS += -mthumb-interwork
+endif
 CFLAGS += -fno-exceptions
 CFLAGS += -ffunction-sections
 CFLAGS += -funwind-tables
@@ -48,7 +64,11 @@ LLINK += -lz
 LFLAGS += $(CMDLINE_LFLAGS)
 LFLAGS += $(ANDROID_LINK_EXECUTABLE)
 
+ifeq ($(ARCH),arm64)
+LRPATH  = -Wl,-rpath,$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib
+else
 LRPATH  = -Wl,-rpath,$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib:$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/system/lib
+endif
 
 ####################################################################################################
 ## sources