diff options
author | Nick Vaccaro <nvaccaro@google.com> | 2015-05-19 23:15:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-19 23:15:50 +0000 |
commit | 0212561eed3641576a23421af50c9948f315546b (patch) | |
tree | 88c75b3c9cfa9e0cfe95dce32ebc2c79391cb115 /6515/libsensors_iio/software/simple_apps/gesture_test/build/android/shared.mk | |
parent | da7d68b77214908887cfe6a709290d8c1b20e768 (diff) | |
parent | a03869ce9a355d3606fccdbab41edc7bb1d32024 (diff) | |
download | android_hardware_invensense-0212561eed3641576a23421af50c9948f315546b.tar.gz android_hardware_invensense-0212561eed3641576a23421af50c9948f315546b.tar.bz2 android_hardware_invensense-0212561eed3641576a23421af50c9948f315546b.zip |
am a03869ce: Merge commit \'9b7ebb51\' into manualmerge
* commit 'a03869ce9a355d3606fccdbab41edc7bb1d32024':
Invensense: 6515: Update HAL to v5_2_0_L_RC26-2015-02-27
Diffstat (limited to '6515/libsensors_iio/software/simple_apps/gesture_test/build/android/shared.mk')
-rw-r--r-- | 6515/libsensors_iio/software/simple_apps/gesture_test/build/android/shared.mk | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/shared.mk b/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/shared.mk index 8591982..67a20db 100644 --- a/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/shared.mk +++ b/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/shared.mk @@ -2,7 +2,18 @@ EXEC = inv_gesture_test$(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 @@ -51,7 +67,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 |