Merge "Remove checks for TARGET_SIMULATOR"
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 @@
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 f3ce2d3..314f9a5 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 @@
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 @@
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)),)
