commit 5c3560571bb9b3a3d2d2753707db74417db0f9f1
author Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:24 2011 -0700
committer Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:24 2011 -0700
tree dffe8cf0791964b09692476f220e655cc1d6730c
parent bdd1ef0af8eef781d1df22204331c76d23c96c87

Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I77e0620f7543926b5def7666c02d99565f6487ed

Android.mk

diff --git a/Android.mk b/Android.mk
index 83caee8..1faf6e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,24 +13,13 @@
 
 LOCAL_INCLUDES += $(LOCAL_PATH)
 
-ifneq ($(TARGET_SIMULATOR),true)
-  LOCAL_CFLAGS  += -DQEMU_HARDWARE
-  QEMU_HARDWARE := true
-endif
+LOCAL_CFLAGS  += -DQEMU_HARDWARE
+QEMU_HARDWARE := true
 
-ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += libdl
-endif
 
 include $(SAVE_MAKEFILES)
 
-# need "-lrt" on Linux simulator to pick up clock_gettime
-ifeq ($(TARGET_SIMULATOR),true)
-	ifeq ($(HOST_OS),linux)
-		LOCAL_LDLIBS += -lrt -lpthread -ldl
-	endif
-endif
-
 LOCAL_MODULE:= libhardware_legacy
 
 include $(BUILD_SHARED_LIBRARY)