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 | d87f162026454f5a3e6437ed0c9ef51651a6b939 (patch) | |
| tree | 702b5e56762a0236c86242279894607948c8fb71 /services/surfaceflinger | |
| parent | d3f9a53bffa049d900ebb1a93048ab0bb6885b50 (diff) | |
| download | frameworks_native-d87f162026454f5a3e6437ed0c9ef51651a6b939.zip frameworks_native-d87f162026454f5a3e6437ed0c9ef51651a6b939.tar.gz frameworks_native-d87f162026454f5a3e6437ed0c9ef51651a6b939.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 'services/surfaceflinger')
| -rw-r--r-- | services/surfaceflinger/Android.mk | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/resize/Android.mk | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/screencap/Android.mk | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/surface/Android.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index 8a00a2e..9daaad8 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -41,7 +41,7 @@ LOCAL_SHARED_LIBRARIES := \ libGLESv1_CM \ libbinder \ libui \ - libsurfaceflinger_client + libgui LOCAL_C_INCLUDES := \ $(call include-path-for, corecg graphics) 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libbinder \ libui \ - libsurfaceflinger_client + libgui LOCAL_MODULE:= test-surface |