diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-25 15:40:23 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-25 15:40:23 -0800 |
| commit | 5ecbdf58b0674ac4a8b9d56b49ebeb1033e5bd27 (patch) | |
| tree | 0c2f658bc0229decf50abc3f109f293374c988e1 /media/libstagefright/Android.mk | |
| parent | 90deef9fd14cd00a26c06f208a871deb68881326 (diff) | |
| download | frameworks_av-5ecbdf58b0674ac4a8b9d56b49ebeb1033e5bd27.zip frameworks_av-5ecbdf58b0674ac4a8b9d56b49ebeb1033e5bd27.tar.gz frameworks_av-5ecbdf58b0674ac4a8b9d56b49ebeb1033e5bd27.tar.bz2 | |
Link the platform libRScpp, not the NDK's.
The NDK's is linked against stlport, the platform's against libc++.
Change-Id: I9114d56f165533de2d7c908fd9ccb1c38984b49b
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 7c4f92a..1810031 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -112,13 +112,13 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_id3 \ libFLAC \ libmedia_helper \ - libRScpp_static LOCAL_SHARED_LIBRARIES += \ libstagefright_enc_common \ libstagefright_avc_common \ libstagefright_foundation \ - libdl + libdl \ + libRScpp \ LOCAL_CFLAGS += -Wno-multichar |