diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-12-10 21:33:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 21:33:08 +0000 |
| commit | f7abaf8f475ba88d76e9d4e0c7eaab9e97cc31c1 (patch) | |
| tree | d89b2546ff4443d0876558b99074e1ecfacb0fd3 | |
| parent | 57a4b432a62298ed31dbac152ad1ca2ed3ea660e (diff) | |
| parent | e94f7bf5af19eb83311358eb9db4fd16b5cc50ff (diff) | |
| download | invensense-f7abaf8f475ba88d76e9d4e0c7eaab9e97cc31c1.tar.gz | |
am e94f7bf5: am e3804bc5: Merge "Remove checks for TARGET_SIMULATOR"
* commit 'e94f7bf5af19eb83311358eb9db4fd16b5cc50ff':
Remove checks for TARGET_SIMULATOR
| -rw-r--r-- | 60xx/libsensors_iio/Android.mk | 4 | ||||
| -rwxr-xr-x | 6515/libsensors_iio/Android.mk | 4 | ||||
| -rw-r--r-- | 65xx/libsensors_iio/Android.mk | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/60xx/libsensors_iio/Android.mk b/60xx/libsensors_iio/Android.mk index 7bb8ac9..f08a1f5 100644 --- a/60xx/libsensors_iio/Android.mk +++ b/60xx/libsensors_iio/Android.mk @@ -15,8 +15,6 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(TARGET_SIMULATOR),true) - # InvenSense fragment of the HAL include $(CLEAR_VARS) @@ -98,5 +96,3 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/lib OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) LOCAL_STRIP_MODULE := true include $(BUILD_PREBUILT) - -endif # !TARGET_SIMULATOR diff --git a/6515/libsensors_iio/Android.mk b/6515/libsensors_iio/Android.mk index bf72b75..4aedd56 100755 --- a/6515/libsensors_iio/Android.mk +++ b/6515/libsensors_iio/Android.mk @@ -15,8 +15,6 @@ LOCAL_PATH := $(call my-dir) -#ifneq ($(TARGET_SIMULATOR),true) - # InvenSense fragment of the HAL include $(CLEAR_VARS) @@ -83,8 +81,6 @@ LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) -#endif # !TARGET_SIMULATOR - # Build a temporary HAL that links the InvenSense .so include $(CLEAR_VARS) ifeq ($(filter eng, userdebug, user, $(TARGET_BUILD_VARIANT)),) diff --git a/65xx/libsensors_iio/Android.mk b/65xx/libsensors_iio/Android.mk index 80459b9..363549f 100644 --- a/65xx/libsensors_iio/Android.mk +++ b/65xx/libsensors_iio/Android.mk @@ -15,8 +15,6 @@ LOCAL_PATH := $(call my-dir) -#ifneq ($(TARGET_SIMULATOR),true) - # InvenSense fragment of the HAL include $(CLEAR_VARS) @@ -91,8 +89,6 @@ LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) -#endif # !TARGET_SIMULATOR - # Build a temporary HAL that links the InvenSense .so include $(CLEAR_VARS) ifneq ($(filter dory guppy guppypdk, $(TARGET_DEVICE)),) |