1 files changed, 30 insertions, 1 deletions
diff --git a/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/shared.mk b/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/shared.mk
index 2dda9e0..dc6c46b 100644
--- a/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/shared.mk
+++ b/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/shared.mk
@@ -2,7 +2,18 @@ EXEC = inv_mpu_iio$(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
 
@@ -18,13 +29,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
@@ -35,6 +51,10 @@ CFLAGS += -I$(MLLITE_DIR)
 CFLAGS += -I$(MPL_DIR)
 CFLAGS += $(INV_INCLUDES)
 CFLAGS += $(INV_DEFINES)
+#for arm64 --yd
+ifeq ($(ARCH),arm64)
+#--yd CFLAGS += -Bdynamic -pie
+endif
 
 LLINK  = -lc
 LLINK += -lm
@@ -45,11 +65,20 @@ LLINK += -ldl
 LLINK += -lstdc++
 LLINK += -llog
 LLINK += -lz
+ifeq ($(ARCH),arm64)
+#--yd LLINK += -Wl,-dynamic-linker,/system/bin/linker64 -Wl,-z,nocopyreloc
+#--yd LLINK += -Wl,-rpath-link=out/target/product/generic_arm64/obj/lib
+#--yd LLINK += -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,-maarch64linux -Wl,--no-undefined
+endif
 
 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