| commit | d87f162026454f5a3e6437ed0c9ef51651a6b939 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Fri Mar 25 18:42:40 2011 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Fri Mar 25 18:42:40 2011 -0700 |
| tree | 702b5e56762a0236c86242279894607948c8fb71 | |
| parent | d3f9a53bffa049d900ebb1a93048ab0bb6885b50 [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
diff --git a/services/surfaceflinger/tests/resize/Android.mk b/services/surfaceflinger/tests/resize/Android.mk index 24c2d01..d81679e 100644 --- a/services/surfaceflinger/tests/resize/Android.mk +++ b/services/surfaceflinger/tests/resize/Android.mk
@@ -8,7 +8,7 @@ libcutils \ libutils \ libui \ - libsurfaceflinger_client + libgui LOCAL_MODULE:= test-resize
diff --git a/services/surfaceflinger/tests/screencap/Android.mk b/services/surfaceflinger/tests/screencap/Android.mk index 1cfb471..5cdd1a8 100644 --- a/services/surfaceflinger/tests/screencap/Android.mk +++ b/services/surfaceflinger/tests/screencap/Android.mk
@@ -10,7 +10,7 @@ libbinder \ libskia \ libui \ - libsurfaceflinger_client + libgui LOCAL_MODULE:= test-screencap
diff --git a/services/surfaceflinger/tests/surface/Android.mk b/services/surfaceflinger/tests/surface/Android.mk index ce0e807..c59060e 100644 --- a/services/surfaceflinger/tests/surface/Android.mk +++ b/services/surfaceflinger/tests/surface/Android.mk
@@ -9,7 +9,7 @@ libutils \ libbinder \ libui \ - libsurfaceflinger_client + libgui LOCAL_MODULE:= test-surface