Remove simulator conditionals.
Simulator is gone.
Change-Id: Ia4454bde6d16666830b553ec42e5c19359505103
diff --git a/tools/emulator/system/gps/Android.mk b/tools/emulator/system/gps/Android.mk
index d41c5a7..9daf4d6 100644
--- a/tools/emulator/system/gps/Android.mk
+++ b/tools/emulator/system/gps/Android.mk
@@ -22,7 +22,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(TARGET_PRODUCT),sim)
# HAL module implemenation stored in
# hw/<GPS_HARDWARE_MODULE_ID>.<ro.hardware>.so
include $(CLEAR_VARS)
@@ -38,6 +37,5 @@
endif
LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY)
-endif
endif # BUILD_EMULATOR_GPS_MODULE
diff --git a/tools/emulator/system/lights/Android.mk b/tools/emulator/system/lights/Android.mk
index c7aa83c..f0f76dc 100644
--- a/tools/emulator/system/lights/Android.mk
+++ b/tools/emulator/system/lights/Android.mk
@@ -14,7 +14,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(TARGET_PRODUCT),sim)
# HAL module implemenation, not prelinked and stored in
# hw/<LIGHTS_HARDWARE_MODULE_ID>.<ro.hardware>.so
include $(CLEAR_VARS)
@@ -26,4 +25,3 @@
LOCAL_MODULE_TAGS := debug
LOCAL_CFLAGS += -DLIGHT_BACKLIGHT
include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/tools/emulator/system/qemu-props/Android.mk b/tools/emulator/system/qemu-props/Android.mk
index 1bdbf68..1b2932f 100644
--- a/tools/emulator/system/qemu-props/Android.mk
+++ b/tools/emulator/system/qemu-props/Android.mk
@@ -25,8 +25,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(TARGET_PRODUCT),sim)
-
# The 'qemu-props' program is run from /system/etc/init.goldfish.rc
# to setup various system properties sent by the emulator program.
#
@@ -39,6 +37,4 @@
LOCAL_MODULE_TAGS := debug
include $(BUILD_EXECUTABLE)
-endif # TARGET_PRODUCT != sim
-
endif # BUILD_EMULATOR_QEMU_PROPS
