summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-03-25 18:42:40 -0700
committerMathias Agopian <mathias@google.com>2011-03-25 18:42:40 -0700
commit5f7fcf29a7475a20cf38bf72da67746135d504c3 (patch)
treef5e03d6a8f7d6b70b91cc95bc2324a1cc6492f10 /camera
parentf490e1765c44f63bde8e8acd905f36f92a840ddf (diff)
downloadframeworks_av-5f7fcf29a7475a20cf38bf72da67746135d504c3.zip
frameworks_av-5f7fcf29a7475a20cf38bf72da67746135d504c3.tar.gz
frameworks_av-5f7fcf29a7475a20cf38bf72da67746135d504c3.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 'camera')
-rw-r--r--camera/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index 2f16923..b17b3d2 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -13,7 +13,6 @@ LOCAL_SHARED_LIBRARIES := \
libutils \
libbinder \
libhardware \
- libsurfaceflinger_client \
libui \
libgui