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 | |
| 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')
11 files changed, 136 insertions, 8 deletions
diff --git a/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/inv_devnode_parser-shared b/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/inv_devnode_parser-shared Binary files differindex 6ced019..56d04f9 100755 --- a/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/inv_devnode_parser-shared +++ b/6515/libsensors_iio/software/simple_apps/devnode_parser/build/android/inv_devnode_parser-shared 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 diff --git a/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/inv_gesture_test-shared b/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/inv_gesture_test-shared Binary files differindex f59b8d3..9eabad9 100755 --- a/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/inv_gesture_test-shared +++ b/6515/libsensors_iio/software/simple_apps/gesture_test/build/android/inv_gesture_test-shared 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 diff --git a/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/inv_mpu_iio-shared b/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/inv_mpu_iio-shared Binary files differindex 209700b..943b747 100755 --- a/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/inv_mpu_iio-shared +++ b/6515/libsensors_iio/software/simple_apps/mpu_iio/build/android/inv_mpu_iio-shared 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 diff --git a/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/inv_playback-shared b/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/inv_playback-shared Binary files differindex 692612e..4ba5116 100755 --- a/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/inv_playback-shared +++ b/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/inv_playback-shared diff --git a/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/shared.mk b/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/shared.mk index dc33ee3..98d3954 100644 --- a/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/shared.mk +++ b/6515/libsensors_iio/software/simple_apps/playback/linux/build/android/shared.mk @@ -2,7 +2,18 @@ EXEC = inv_playback$(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 @@ -19,13 +30,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 diff --git a/6515/libsensors_iio/software/simple_apps/self_test/build/android/inv_self_test-shared b/6515/libsensors_iio/software/simple_apps/self_test/build/android/inv_self_test-shared Binary files differindex c537f77..c46b16a 100755 --- a/6515/libsensors_iio/software/simple_apps/self_test/build/android/inv_self_test-shared +++ b/6515/libsensors_iio/software/simple_apps/self_test/build/android/inv_self_test-shared diff --git a/6515/libsensors_iio/software/simple_apps/self_test/build/android/shared.mk b/6515/libsensors_iio/software/simple_apps/self_test/build/android/shared.mk index ed5fbf6..a00d732 100644 --- a/6515/libsensors_iio/software/simple_apps/self_test/build/android/shared.mk +++ b/6515/libsensors_iio/software/simple_apps/self_test/build/android/shared.mk @@ -2,7 +2,18 @@ EXEC = inv_self_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 @@ -20,13 +31,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 @@ -52,8 +68,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 diff --git a/6515/libsensors_iio/software/simple_apps/stress_iio/build/android/shared.mk b/6515/libsensors_iio/software/simple_apps/stress_iio/build/android/shared.mk index fe844a5..56e9125 100644 --- a/6515/libsensors_iio/software/simple_apps/stress_iio/build/android/shared.mk +++ b/6515/libsensors_iio/software/simple_apps/stress_iio/build/android/shared.mk @@ -2,7 +2,18 @@ EXEC = inv_stress_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 @@ -49,7 +65,11 @@ LLINK += -lz LFLAGS += $(CMDLINE_LFLAGS) LFLAGS += $(ANDROID_LINK_EXECUTABLE) -LRPATH = -Wl,-rpath,$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib:$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/system/lib +ifeq ($(ARCH),arm64) +LRPATH = -Wl,-rpath,$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib +else +#--yd LRPATH = -Wl,-rpath,$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib:$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/system/lib +endif #################################################################################################### ## sources |