diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-03 10:08:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-03 10:08:46 -0700 |
| commit | be512bff60626efc9a4b85d271d6210b9115e5fc (patch) | |
| tree | ac9880e5375c21cf4d23c6a231422a159755594c | |
| parent | 33a22dc9c84ef12006b0c12f6d169d2a74c15284 (diff) | |
| parent | 8aeac9408ff74126a1b3e9bb58b86056350b708d (diff) | |
| download | frameworks_base-be512bff60626efc9a4b85d271d6210b9115e5fc.zip frameworks_base-be512bff60626efc9a4b85d271d6210b9115e5fc.tar.gz frameworks_base-be512bff60626efc9a4b85d271d6210b9115e5fc.tar.bz2 | |
Merge change 3038 into donut
* changes:
Cleaning up makefile for libttssynthproxy for the simulator.
| -rwxr-xr-x | tts/jni/Android.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tts/jni/Android.mk b/tts/jni/Android.mk index bb76583..665d6d2 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 |
