diff options
author | Mark Salyzyn <salyzyn@google.com> | 2015-02-25 20:51:59 +0000 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2015-02-25 20:51:59 +0000 |
commit | deb5d22e3769be80b6627c812dba9ea3b5a90f0a (patch) | |
tree | 6c57fb081a017af68726a07c21f7c23bc5017d5d /60xx/libsensors_iio/Android.mk | |
parent | 0850f97bc90f715e7e4496203cf7cf26050819a2 (diff) | |
download | invensense-deb5d22e3769be80b6627c812dba9ea3b5a90f0a.tar.gz |
Revert "manta: batching and timestamp issues"
Breaks AOSP build for Manta.
New Build Breakage in branch: git_mirror-aosp-master-with-vendor @ 1754987
This reverts commit 0850f97bc90f715e7e4496203cf7cf26050819a2.
Change-Id: If8635b47a9a1423711eba96b75ef270da82da91c
Diffstat (limited to '60xx/libsensors_iio/Android.mk')
-rw-r--r-- | 60xx/libsensors_iio/Android.mk | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/60xx/libsensors_iio/Android.mk b/60xx/libsensors_iio/Android.mk index 874f63e..5d936a2 100644 --- a/60xx/libsensors_iio/Android.mk +++ b/60xx/libsensors_iio/Android.mk @@ -84,8 +84,6 @@ OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) LOCAL_STRIP_MODULE := true include $(BUILD_PREBUILT) -# Experimental -ifneq ($(BOARD_INV_LIBMLLITE_FROM_SOURCE),true) include $(CLEAR_VARS) LOCAL_MODULE := libmllite LOCAL_SRC_FILES := libmllite.so @@ -97,18 +95,3 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/lib OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) LOCAL_STRIP_MODULE := true include $(BUILD_PREBUILT) -else -include $(CLEAR_VARS) -LOCAL_CFLAGS += -DANDROID_JELLYBEAN -LOCAL_CFLAGS += -DLINUX=1 -LOCAL_MODULE := libmllite -LOCAL_SRC_FILES := $(call all-c-files-under, software/core/mllite) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/software/core/mllite -LOCAL_C_INCLUDES += $(LOCAL_PATH)/software/core/mllite/linux -LOCAL_C_INCLUDES += $(LOCAL_PATH)/software/core/driver/include -LOCAL_C_INCLUDES += $(LOCAL_PATH)/software/core/driver/include/linux -LOCAL_MODULE_OWNER := invensense -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib -LOCAL_SHARED_LIBRARIES := liblog -include $(BUILD_SHARED_LIBRARY) -endif |