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 | 5f7fcf29a7475a20cf38bf72da67746135d504c3 (patch) | |
tree | f5e03d6a8f7d6b70b91cc95bc2324a1cc6492f10 /cmds | |
parent | f490e1765c44f63bde8e8acd905f36f92a840ddf (diff) |
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 'cmds')
-rw-r--r-- | cmds/stagefright/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 1b13dd95..e9642f7c 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright libmedia libutils libbinder libstagefright_foundation \ - libskia libsurfaceflinger_client libgui + libskia libgui LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ @@ -107,7 +107,7 @@ LOCAL_SRC_FILES:= \ stream.cpp \ LOCAL_SHARED_LIBRARIES := \ - libstagefright liblog libutils libbinder libsurfaceflinger_client \ + libstagefright liblog libutils libbinder libgui \ libstagefright_foundation libmedia LOCAL_C_INCLUDES:= \ @@ -132,7 +132,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation \ - libmedia libsurfaceflinger_client libcutils libui + libmedia libgui libcutils libui LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ |