diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Android.mk | 15 | ||||
| -rw-r--r-- | services/input/Android.mk | 4 | ||||
| -rw-r--r-- | services/input/tests/Android.mk | 4 | ||||
| -rw-r--r-- | services/jni/Android.mk | 8 | ||||
| -rw-r--r-- | services/sensorservice/Android.mk | 7 | ||||
| -rw-r--r-- | services/surfaceflinger/Android.mk | 7 |
6 files changed, 2 insertions, 43 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 75d24a1..6bb1f56 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -20,23 +20,12 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libhardware \ libhardware_legacy \ - libeffects + libeffects \ + libdl LOCAL_STATIC_LIBRARIES := \ libmedia_helper -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif - LOCAL_MODULE:= libaudioflinger -ifeq ($(TARGET_SIMULATOR),true) - ifeq ($(HOST_OS),linux) - LOCAL_LDLIBS += -lrt -lpthread - endif -endif - include $(BUILD_SHARED_LIBRARY) diff --git a/services/input/Android.mk b/services/input/Android.mk index 836c081..e36507a 100644 --- a/services/input/Android.mk +++ b/services/input/Android.mk @@ -41,10 +41,6 @@ LOCAL_MODULE:= libinput LOCAL_MODULE_TAGS := optional -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -lpthread -endif - include $(BUILD_SHARED_LIBRARY) diff --git a/services/input/tests/Android.mk b/services/input/tests/Android.mk index cabbccb..d92fc74 100644 --- a/services/input/tests/Android.mk +++ b/services/input/tests/Android.mk @@ -2,8 +2,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -ifneq ($(TARGET_SIMULATOR),true) - # Build the unit tests. test_src_files := \ InputReader_test.cpp \ @@ -45,5 +43,3 @@ $(foreach file,$(test_src_files), \ # Build the manual test programs. include $(call all-subdir-makefiles) - -endif
\ No newline at end of file diff --git a/services/jni/Android.mk b/services/jni/Android.mk index f33920d..e1c7305 100644 --- a/services/jni/Android.mk +++ b/services/jni/Android.mk @@ -39,14 +39,6 @@ LOCAL_SHARED_LIBRARIES := \ libgui \ libusbhost -ifeq ($(TARGET_SIMULATOR),true) -ifeq ($(TARGET_OS),linux) -ifeq ($(TARGET_ARCH),x86) -LOCAL_LDLIBS += -lpthread -ldl -lrt -endif -endif -endif - ifeq ($(WITH_MALLOC_LEAK_CHECK),true) LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK endif diff --git a/services/sensorservice/Android.mk b/services/sensorservice/Android.mk index ba3e6e5..6a302c0 100644 --- a/services/sensorservice/Android.mk +++ b/services/sensorservice/Android.mk @@ -16,13 +16,6 @@ LOCAL_SRC_FILES:= \ LOCAL_CFLAGS:= -DLOG_TAG=\"SensorService\" -# need "-lrt" on Linux simulator to pick up clock_gettime -ifeq ($(TARGET_SIMULATOR),true) - ifeq ($(HOST_OS),linux) - LOCAL_LDLIBS += -lrt -lpthread - endif -endif - LOCAL_SHARED_LIBRARIES := \ libcutils \ libhardware \ diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index c618263..f67c82e 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -26,13 +26,6 @@ ifeq ($(TARGET_BOARD_PLATFORM), s5pc110) endif -# need "-lrt" on Linux simulator to pick up clock_gettime -ifeq ($(TARGET_SIMULATOR),true) - ifeq ($(HOST_OS),linux) - LOCAL_LDLIBS += -lrt -lpthread - endif -endif - LOCAL_SHARED_LIBRARIES := \ libcutils \ libhardware \ |