| commit | 7fa9e2a24d4e17429d64eadb996e8780e5c5c399 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 13 18:16:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 13 18:16:50 2016 +0000 |
| tree | 649f913d8811acfdbc0482f5052deb426822a9f4 | |
| parent | 1cea82dd71daefcdc7bb19f1f2dfab59fd8f0cd7 [diff] | |
| parent | fa67ff7a92238680c66994502a289962c6a18009 [diff] |
Merge "Express libmedia dependencies in libmediaplayerservice" am: b0ba11e am: fa67ff7 * commit 'fa67ff7a92238680c66994502a289962c6a18009': Express libmedia dependencies in libmediaplayerservice Change-Id: I683d45a6e4b61a4a220ca811ddb82485b273c51d
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 7f41143..b5d1deb 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk
@@ -46,6 +46,8 @@ libstagefright_rtsp \ libstagefright_timedtext \ +LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia + LOCAL_C_INCLUDES := \ $(TOP)/frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/av/media/libstagefright/rtsp \
diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk index cd20837..3ea2159 100644 --- a/media/libmediaplayerservice/nuplayer/Android.mk +++ b/media/libmediaplayerservice/nuplayer/Android.mk
@@ -34,6 +34,8 @@ LOCAL_CLANG := true +LOCAL_SHARED_LIBRARIES := libmedia + LOCAL_MODULE:= libstagefright_nuplayer LOCAL_MODULE_TAGS := eng