diff --git a/tools/emulator/system/gps/Android.mk b/tools/emulator/system/gps/Android.mk
index d41c5a7a3..9daf4d6be 100644
--- a/tools/emulator/system/gps/Android.mk
+++ b/tools/emulator/system/gps/Android.mk
@@ -22,7 +22,6 @@ BUILD_EMULATOR_GPS_MODULE := true
 
 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 @@ LOCAL_MODULE := gps.goldfish
 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 c7aa83c25..f0f76dc47 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 := lights.goldfish
 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 1bdbf684a..1b2932f1c 100644
--- a/tools/emulator/system/qemu-props/Android.mk
+++ b/tools/emulator/system/qemu-props/Android.mk
@@ -25,8 +25,6 @@ BUILD_EMULATOR_QEMU_PROPS := true
 
 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_SHARED_LIBRARIES := libcutils
 LOCAL_MODULE_TAGS := debug
 include $(BUILD_EXECUTABLE)
 
-endif # TARGET_PRODUCT != sim
-
 endif # BUILD_EMULATOR_QEMU_PROPS