summaryrefslogtreecommitdiffstats
path: root/graphics/jni
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
commit696257ccf315a1da042787c5b2d1f80c7146fc94 (patch)
tree39c185c6f97540243e5d071e545343822f46f2cc /graphics/jni
parent1be6cce70175bd90744498d5fca95e3f9eec1cf6 (diff)
downloadframeworks_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 'graphics/jni')
-rw-r--r--graphics/jni/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk
index 4c4a128..084f54a 100644
--- a/graphics/jni/Android.mk
+++ b/graphics/jni/Android.mk
@@ -19,7 +19,7 @@ LOCAL_SHARED_LIBRARIES := \
libskia \
libutils \
libui \
- libsurfaceflinger_client
+ libgui
LOCAL_STATIC_LIBRARIES :=