OSDN Git Service
(root)
/
android-x86
/
hardware-libhardware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
[android-x86/hardware-libhardware.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
30b3337
..
7467bf2
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-10,24
+10,13
@@
LOCAL_SHARED_LIBRARIES := libcutils
LOCAL_INCLUDES += $(LOCAL_PATH)
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
LOCAL_SHARED_LIBRARIES += libdl
-endif
LOCAL_SRC_FILES += hardware.c
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)
LOCAL_MODULE:= libhardware
include $(BUILD_SHARED_LIBRARY)