Merge change 3038 into donut

* changes: Cleaning up makefile for libttssynthproxy for the simulator.
2009-06-03 10:08:46 -07:00
parent 33a22dc9c8 8aeac9408f
commit be512bff60
1 changed files with 4 additions and 7 deletions
--- a/tts/jni/Android.mk
+++ b/tts/jni/Android.mk
@@ -14,13 +14,10 @@ LOCAL_SHARED_LIBRARIES := \
 	libutils \
 	libcutils

-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += \
-	libdl
-endif
-
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
 endif