diff options
| author | Nick Vaccaro <nvaccaro@google.com> | 2014-05-23 19:44:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 19:44:15 +0000 |
| commit | c162d6965285f228f8881cbb73d9064070d40278 (patch) | |
| tree | e315f19b133dee307451a9985bb73e1b32aaf4c9 /6515/libsensors_iio | |
| parent | a8cbd432ec37a2aa6e510d392ce25df59cd10b79 (diff) | |
| parent | 365ddc02efe4cac1e87dd8e6736892843fd720c1 (diff) | |
| download | invensense-c162d6965285f228f8881cbb73d9064070d40278.tar.gz | |
am 365ddc02: am 1b7f982c: Invensense: 6515: fix build break for user builds
* commit '365ddc02efe4cac1e87dd8e6736892843fd720c1':
Invensense: 6515: fix build break for user builds
Diffstat (limited to '6515/libsensors_iio')
| -rwxr-xr-x | 6515/libsensors_iio/Android.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/6515/libsensors_iio/Android.mk b/6515/libsensors_iio/Android.mk index f530a10..451b7b0 100755 --- a/6515/libsensors_iio/Android.mk +++ b/6515/libsensors_iio/Android.mk @@ -28,7 +28,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" LOCAL_CFLAGS += -DANDROID_KITKAT -ifneq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug)) +ifneq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug user)) ifneq ($(COMPILE_INVENSENSE_COMPASS_CAL),0) LOCAL_CFLAGS += -DINVENSENSE_COMPASS_CAL endif @@ -45,7 +45,7 @@ LOCAL_SRC_FILES += MPLSupport.cpp LOCAL_SRC_FILES += InputEventReader.cpp LOCAL_SRC_FILES += PressureSensor.IIO.secondary.cpp -ifneq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug)) +ifneq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug user)) ifeq ($(COMPILE_INVENSENSE_COMPASS_CAL),0) LOCAL_SRC_FILES += AkmSensor.cpp LOCAL_SRC_FILES += CompassSensor.AKM.cpp @@ -57,7 +57,7 @@ LOCAL_SRC_FILES += CompassSensor.IIO.9150.cpp endif else # release builds, default LOCAL_SRC_FILES += CompassSensor.IIO.9150.cpp -endif #userdebug +endif # eng, userdebug & user builds LOCAL_C_INCLUDES += $(LOCAL_PATH)/software/core/mllite LOCAL_C_INCLUDES += $(LOCAL_PATH)/software/core/mllite/linux @@ -87,7 +87,7 @@ include $(BUILD_SHARED_LIBRARY) # Build a temporary HAL that links the InvenSense .so include $(CLEAR_VARS) -ifeq ($(filter eng, userdebug, $(TARGET_BUILD_VARIANT)),) +ifeq ($(filter eng, userdebug, user, $(TARGET_BUILD_VARIANT)),) ifneq ($(filter manta full_grouper tilapia, $(TARGET_PRODUCT)),) LOCAL_MODULE := sensors.full_grouper LOCAL_MODULE_OWNER := invensense @@ -101,9 +101,9 @@ LOCAL_MODULE := sensors.invensense LOCAL_MODULE_OWNER := invensense endif endif -else # eng & userdebug builds +else # eng, user, & userdebug builds LOCAL_MODULE := sensors.invensense -endif # eng & userdebug builds +endif # eng, user & userdebug builds LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SHARED_LIBRARIES += libmplmpu @@ -119,7 +119,7 @@ LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" LOCAL_CFLAGS += -DANDROID_KITKAT -ifneq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug)) +ifneq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug user)) ifneq ($(COMPILE_INVENSENSE_COMPASS_CAL),0) LOCAL_CFLAGS += -DINVENSENSE_COMPASS_CAL endif @@ -134,18 +134,18 @@ LOCAL_SRC_FILES += CompassSensor.IIO.9150.cpp endif else # release builds, default LOCAL_SRC_FILES += CompassSensor.IIO.9150.cpp -endif # userdebug +endif # eng, userdebug & user -ifeq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug)) +ifeq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug user)) ifneq ($(filter manta grouper tilapia, $(TARGET_DEVICE)),) # it's already defined in some other Makefile for production builds #LOCAL_SRC_FILES := sensors_mpl.cpp else LOCAL_SRC_FILES := sensors_mpl.cpp endif -else # eng & userdebug builds +else # eng, userdebug & user builds LOCAL_SRC_FILES := sensors_mpl.cpp -endif # eng & userdebug builds +endif # eng, userdebug & user builds LOCAL_SHARED_LIBRARIES := libinvensense_hal LOCAL_SHARED_LIBRARIES += libcutils |