diff options
| author | 2009-05-22 01:27:01 -0700 | |
|---|---|---|
| committer | 2009-05-22 02:16:08 -0700 | |
| commit | 947f4f4d384ea26eb2145cc070a3eed42c59534a (patch) | |
| tree | edc5fb1e6e808a2b809720f44b6236ebe93b577b /libs/surfaceflinger/VRamHeap.cpp | |
| parent | 6158b1bf0364da1582468a98ec09d004ba99deec (diff) | |
| parent | 0690519fcde1ccb189081aa79df61436f65686c2 (diff) | |
merge master to master_gl
Diffstat (limited to 'libs/surfaceflinger/VRamHeap.cpp')
| -rw-r--r-- | libs/surfaceflinger/VRamHeap.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/surfaceflinger/VRamHeap.cpp b/libs/surfaceflinger/VRamHeap.cpp index 238c602e8684..68c0a5edda7a 100644 --- a/libs/surfaceflinger/VRamHeap.cpp +++ b/libs/surfaceflinger/VRamHeap.cpp @@ -30,10 +30,12 @@ #include <cutils/log.h> #include <cutils/properties.h> -#include <utils/MemoryDealer.h> -#include <utils/MemoryBase.h> -#include <utils/MemoryHeapPmem.h> -#include <utils/MemoryHeapBase.h> +#include <binder/MemoryDealer.h> +#include <binder/MemoryBase.h> +#include <binder/MemoryHeapPmem.h> +#include <binder/MemoryHeapBase.h> + +#include <EGL/eglnatives.h> #include "GPUHardware/GPUHardware.h" #include "SurfaceFlinger.h" |