diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-12-12 10:56:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-12 10:56:42 -0800 |
| commit | c6f04666c205a72add3c856455bf212f0c84d6fc (patch) | |
| tree | 415b8558b426c9f77131cdf4ff13c33498c74f84 | |
| parent | 97eba8904c2f221c42a9473407223a4c3a213f75 (diff) | |
| parent | 392edd88cb63d71a21a86a02cf9c56ac97637128 (diff) | |
| download | frameworks_native-c6f04666c205a72add3c856455bf212f0c84d6fc.zip frameworks_native-c6f04666c205a72add3c856455bf212f0c84d6fc.tar.gz frameworks_native-c6f04666c205a72add3c856455bf212f0c84d6fc.tar.bz2 | |
Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"
| -rw-r--r-- | include/gui/GraphicBufferAlloc.h (renamed from services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.h) | 0 | ||||
| -rw-r--r-- | libs/gui/Android.mk | 23 | ||||
| -rw-r--r-- | libs/gui/GraphicBufferAlloc.cpp (renamed from services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.cpp) | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/Android.mk | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.h b/include/gui/GraphicBufferAlloc.h index b08750c..b08750c 100644 --- a/services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.h +++ b/include/gui/GraphicBufferAlloc.h diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk index d970a33..04444e9 100644 --- a/libs/gui/Android.mk +++ b/libs/gui/Android.mk @@ -3,29 +3,30 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ BitTube.cpp \ + BufferItemConsumer.cpp \ BufferQueue.cpp \ ConsumerBase.cpp \ + CpuConsumer.cpp \ DisplayEventReceiver.cpp \ + DummyConsumer.cpp \ + GraphicBufferAlloc.cpp \ + GuiConfig.cpp \ IDisplayEventConnection.cpp \ + IGraphicBufferAlloc.cpp \ ISensorEventConnection.cpp \ ISensorServer.cpp \ + ISurface.cpp \ + ISurfaceComposer.cpp \ + ISurfaceComposerClient.cpp \ ISurfaceTexture.cpp \ + LayerState.cpp \ Sensor.cpp \ SensorEventQueue.cpp \ SensorManager.cpp \ - SurfaceTexture.cpp \ - SurfaceTextureClient.cpp \ - ISurfaceComposer.cpp \ - ISurface.cpp \ - ISurfaceComposerClient.cpp \ - IGraphicBufferAlloc.cpp \ - LayerState.cpp \ Surface.cpp \ SurfaceComposerClient.cpp \ - DummyConsumer.cpp \ - CpuConsumer.cpp \ - BufferItemConsumer.cpp \ - GuiConfig.cpp + SurfaceTexture.cpp \ + SurfaceTextureClient.cpp \ LOCAL_SHARED_LIBRARIES := \ libbinder \ diff --git a/services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.cpp b/libs/gui/GraphicBufferAlloc.cpp index 965ff01..b360e81 100644 --- a/services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.cpp +++ b/libs/gui/GraphicBufferAlloc.cpp @@ -19,7 +19,7 @@ #include <ui/GraphicBuffer.h> -#include "DisplayHardware/GraphicBufferAlloc.h" +#include <gui/GraphicBufferAlloc.h> // ---------------------------------------------------------------------------- namespace android { diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index f7870f4..b4b19b4 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -11,7 +11,6 @@ LOCAL_SRC_FILES:= \ LayerDim.cpp \ LayerScreenshot.cpp \ DisplayHardware/FramebufferSurface.cpp \ - DisplayHardware/GraphicBufferAlloc.cpp \ DisplayHardware/HWComposer.cpp \ DisplayHardware/PowerHAL.cpp \ GLExtensions.cpp \ diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp index 6c86a53..cccb29b 100644 --- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp +++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp @@ -30,10 +30,10 @@ #include <hardware/hardware.h> #include <gui/SurfaceTextureClient.h> +#include <gui/GraphicBufferAlloc.h> #include <ui/GraphicBuffer.h> #include "DisplayHardware/FramebufferSurface.h" -#include "DisplayHardware/GraphicBufferAlloc.h" #include "DisplayHardware/HWComposer.h" #ifndef NUM_FRAMEBUFFER_SURFACE_BUFFERS diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 41c5cce..f65b82f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -40,6 +40,7 @@ #include <gui/GuiConfig.h> #include <gui/IDisplayEventConnection.h> #include <gui/SurfaceTextureClient.h> +#include <gui/GraphicBufferAlloc.h> #include <ui/GraphicBufferAllocator.h> #include <ui/PixelFormat.h> @@ -65,7 +66,6 @@ #include "SurfaceFlinger.h" #include "DisplayHardware/FramebufferSurface.h" -#include "DisplayHardware/GraphicBufferAlloc.h" #include "DisplayHardware/HWComposer.h" |