From 1cfa384b916005c817d3a4cacdf6c7e6ff73470f Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 11 Jul 2011 22:12:23 -0700 Subject: [PATCH] Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: I19222871077be62d2b6a4a215f251675389ffdb4 --- Android.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Android.mk b/Android.mk index 30b3337b..7467bf29 100644 --- a/Android.mk +++ b/Android.mk @@ -10,24 +10,13 @@ LOCAL_SHARED_LIBRARIES := libcutils 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 LOCAL_SRC_FILES += hardware.c -# 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 include $(BUILD_SHARED_LIBRARY)