diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-12 12:15:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 12:15:45 -0700 |
| commit | d37dcfa70a54ad0454be0ce70fb8ede4c28d2566 (patch) | |
| tree | 1af03be62aecc407692aace60636ba5d6c37e41e | |
| parent | f3008aa707c1c302e8c8f9c8b759f170d972ddce (diff) | |
| parent | 1cfa384b916005c817d3a4cacdf6c7e6ff73470f (diff) | |
| download | libhardware-d37dcfa70a54ad0454be0ce70fb8ede4c28d2566.tar.gz | |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 2 insertions, 13 deletions
@@ -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) |