From 5f7fcf29a7475a20cf38bf72da67746135d504c3 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Fri, 25 Mar 2011 18:42:40 -0700 Subject: 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 --- media/libmedia/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/libmedia/Android.mk') 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 -- cgit v1.1