diff options
| author | Ramanan Rajeswaran <ramanan@google.com> | 2012-09-26 14:24:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 14:24:48 -0700 |
| commit | 64ca18f95225d0a86f7ccfd1d21c23971b9f77ae (patch) | |
| tree | d00916dda47dd39f3d625c834e2f2e04782559f1 /libsensors_iio/software/build/android/common.mk | |
| parent | 6a4d9a48ffde124c498496f6dae1e77c2cae6864 (diff) | |
| download | android_hardware_invensense-64ca18f95225d0a86f7ccfd1d21c23971b9f77ae.tar.gz android_hardware_invensense-64ca18f95225d0a86f7ccfd1d21c23971b9f77ae.tar.bz2 android_hardware_invensense-64ca18f95225d0a86f7ccfd1d21c23971b9f77ae.zip | |
Revert "Official MA 5.1.2 - RC11 Release"
This reverts commit 6a4d9a48ffde124c498496f6dae1e77c2cae6864
Change-Id: I85c4b326a2adf930fcd4a64e4c4f36e99f4fa4cb
Diffstat (limited to 'libsensors_iio/software/build/android/common.mk')
| -rw-r--r-- | libsensors_iio/software/build/android/common.mk | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/libsensors_iio/software/build/android/common.mk b/libsensors_iio/software/build/android/common.mk index 84e7e9b..b84a99c 100644 --- a/libsensors_iio/software/build/android/common.mk +++ b/libsensors_iio/software/build/android/common.mk @@ -4,9 +4,6 @@ SHELL = /bin/bash #################################################################################################### ## defines -# Build for Jellybean -BUILD_ANDROID_JELLYBEAN = 1 - ## libraries ## LIB_PREFIX = lib @@ -19,39 +16,23 @@ TARGET ?= android MLLITE_LIB_NAME ?= mllite MPL_LIB_NAME ?= mplmpu +HALWRAPPER_LIB_NAME ?= androidhal ## applications ## SHARED_APP_SUFFIX = -shared STATIC_APP_SUFFIX = -static #################################################################################################### -## compile, includes, and linker - -ifeq ($(BUILD_ANDROID_JELLYBEAN),1) -ANDROID_COMPILE = -DANDROID_JELLYBEAN=1 -endif +## includes and linker -ANDROID_LINK = -nostdlib -ANDROID_LINK += -fpic -ANDROID_LINK += -Wl,--gc-sections -ANDROID_LINK += -Wl,--no-whole-archive +ANDROID_LINK = -L$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/system/lib ANDROID_LINK += -L$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib -ANDROID_LINK += -L$(ANDROID_ROOT)/out/target/product/$(PRODUCT)/system/lib - -ANDROID_LINK_EXECUTABLE = $(ANDROID_LINK) -ANDROID_LINK_EXECUTABLE += -Wl,-dynamic-linker,/system/bin/linker -ifneq ($(BUILD_ANDROID_JELLYBEAN),1) -ANDROID_LINK_EXECUTABLE += -Wl,-T,$(ANDROID_ROOT)/build/core/armelf.x -endif -ANDROID_LINK_EXECUTABLE += $(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib/crtbegin_dynamic.o -ANDROID_LINK_EXECUTABLE += $(ANDROID_ROOT)/out/target/product/$(PRODUCT)/obj/lib/crtend_android.o ANDROID_INCLUDES = -I$(ANDROID_ROOT)/system/core/include ANDROID_INCLUDES += -I$(ANDROID_ROOT)/hardware/libhardware/include ANDROID_INCLUDES += -I$(ANDROID_ROOT)/hardware/ril/include ANDROID_INCLUDES += -I$(ANDROID_ROOT)/dalvik/libnativehelper/include -ANDROID_INCLUDES += -I$(ANDROID_ROOT)/frameworks/base/include # ICS -ANDROID_INCLUDES += -I$(ANDROID_ROOT)/frameworks/native/include # Jellybean +ANDROID_INCLUDES += -I$(ANDROID_ROOT)/frameworks/base/include ANDROID_INCLUDES += -I$(ANDROID_ROOT)/external/skia/include ANDROID_INCLUDES += -I$(ANDROID_ROOT)/out/target/product/generic/obj/include ANDROID_INCLUDES += -I$(ANDROID_ROOT)/bionic/libc/arch-arm/include |