diff options
| author | Mathias Agopian <mathias@google.com> | 2011-03-25 18:42:40 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-03-25 18:42:40 -0700 |
| commit | 696257ccf315a1da042787c5b2d1f80c7146fc94 (patch) | |
| tree | 39c185c6f97540243e5d071e545343822f46f2cc /media | |
| parent | 1be6cce70175bd90744498d5fca95e3f9eec1cf6 (diff) | |
| download | frameworks_base-696257ccf315a1da042787c5b2d1f80c7146fc94.zip frameworks_base-696257ccf315a1da042787c5b2d1f80c7146fc94.tar.gz frameworks_base-696257ccf315a1da042787c5b2d1f80c7146fc94.tar.bz2 | |
merge libsurfaceflinger_client into libgui
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.
NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.
Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/Android.mk | 2 | ||||
| -rwxr-xr-x | media/jni/mediaeditor/Android.mk | 2 | ||||
| -rw-r--r-- | media/libmedia/Android.mk | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 3 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 1 |
5 files changed, 4 insertions, 6 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 2a89a2a..4fd4147 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -22,7 +22,7 @@ LOCAL_SHARED_LIBRARIES := \ libskia \ libui \ libcutils \ - libsurfaceflinger_client \ + libgui \ libstagefright \ libcamera_client \ libsqlite \ diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index 283b4ea..69cfe8c 100755 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -55,7 +55,7 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libstagefright \ libstagefright_omx \ - libsurfaceflinger_client \ + libgui \ libvideoeditorplayer diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index a04fbd2..ca7441a 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -38,7 +38,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libui libcutils libutils libbinder libsonivox libicuuc libexpat \ - libsurfaceflinger_client libcamera_client libstagefright_foundation \ + libcamera_client libstagefright_foundation \ libgui LOCAL_MODULE:= libmedia diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index e65f6d8..fadad28 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -31,8 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libstagefright \ libstagefright_omx \ - libstagefright_foundation \ - libsurfaceflinger_client \ + libstagefright_foundation \ libgui LOCAL_STATIC_LIBRARIES := \ diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index e445b74..d2e8b46 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -70,7 +70,6 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libsonivox \ libvorbisidec \ - libsurfaceflinger_client \ libstagefright_yuv \ libcamera_client \ libdrmframework \ |