diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:53 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:53 -0700 |
commit | 0f60faff84b9690746e9d85a1ffecc4eb53cc43a (patch) | |
tree | 564d4f72013d812c3b9dd1933348719e76e4fdaa | |
parent | a85e358bd9450bc4148b2673ae5403d54fcc61bf (diff) | |
download | device_samsung_crespo-0f60faff84b9690746e9d85a1ffecc4eb53cc43a.zip device_samsung_crespo-0f60faff84b9690746e9d85a1ffecc4eb53cc43a.tar.gz device_samsung_crespo-0f60faff84b9690746e9d85a1ffecc4eb53cc43a.tar.bz2 |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ie6fa05f8d72bdf6da3b743a7f8c2464f9febc868
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | libaudio/Android.mk | 6 | ||||
-rw-r--r-- | libsensors/Android.mk | 5 |
3 files changed, 1 insertions, 12 deletions
@@ -14,6 +14,4 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(TARGET_SIMULATOR),true) include $(call all-makefiles-under,$(LOCAL_PATH)) -endif diff --git a/libaudio/Android.mk b/libaudio/Android.mk index 9ab312b..b1494ed 100644 --- a/libaudio/Android.mk +++ b/libaudio/Android.mk @@ -14,11 +14,7 @@ LOCAL_SHARED_LIBRARIES:= \ LOCAL_WHOLE_STATIC_LIBRARIES := libaudiohw_legacy LOCAL_MODULE_TAGS := optional -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif +LOCAL_SHARED_LIBRARIES += libdl LOCAL_C_INCLUDES += $(call include-path-for, speex) LOCAL_C_INCLUDES += external/tinyalsa/include diff --git a/libsensors/Android.mk b/libsensors/Android.mk index 09d0336..b451d4a 100644 --- a/libsensors/Android.mk +++ b/libsensors/Android.mk @@ -15,8 +15,6 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(TARGET_SIMULATOR),true) - # HAL module implemenation stored in # hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.product.board>.so include $(CLEAR_VARS) @@ -39,7 +37,4 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := liblog libcutils libdl - include $(BUILD_SHARED_LIBRARY) - -endif # !TARGET_SIMULATOR |