summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android (Google) Code Review <android-gerrit@google.com> 2009-06-03 12:59:59 -0700
committer The Android Open Source Project <initial-contribution@android.com> 2009-06-03 12:59:59 -0700
commit5f81c1e1e633d25617c1f18c5637a3e26ec2b6e8 (patch)
tree88dcd8238aaee7394ac0e0030c1d4228326de796
parent7cdccbc2765658992f0c8520b98613f9c834af9e (diff)
parentb5c7b39b839dafd3a172efe59900063c7c7f7c91 (diff)
am be512bff: Merge change 3038 into donut
Merge commit 'be512bff60626efc9a4b85d271d6210b9115e5fc' * commit 'be512bff60626efc9a4b85d271d6210b9115e5fc': Cleaning up makefile for libttssynthproxy for the simulator.
-rwxr-xr-xtts/jni/Android.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/tts/jni/Android.mk b/tts/jni/Android.mk
index bb76583c52..665d6d20fc 100755
--- 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