diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-10 14:43:56 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-02-11 13:07:41 -0800 |
| commit | c557fc762122cd1bbc9a15778b86728c884a2dfb (patch) | |
| tree | c31eeb14084f11b4398d8a90a262591e9b402c6f | |
| parent | ba1ed26a6f245f68ba76318d7ec9451fb0886922 (diff) | |
| download | external_webkit-c557fc762122cd1bbc9a15778b86728c884a2dfb.zip external_webkit-c557fc762122cd1bbc9a15778b86728c884a2dfb.tar.gz external_webkit-c557fc762122cd1bbc9a15778b86728c884a2dfb.tar.bz2 | |
split libsurfaceflinger_client and libcamera_client out of libui
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | WebCore/platform/android/ScreenAndroid.cpp | 6 | ||||
| -rw-r--r-- | WebKit/android/plugins/ANPSurfaceInterface.cpp | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -244,7 +244,8 @@ LOCAL_SHARED_LIBRARIES := \ libicuuc \ libicudata \ libicui18n \ - libmedia + libmedia \ + libsurfaceflinger_client ifeq ($(WEBCORE_INSTRUMENTATION),true) LOCAL_SHARED_LIBRARIES += libhardware_legacy diff --git a/WebCore/platform/android/ScreenAndroid.cpp b/WebCore/platform/android/ScreenAndroid.cpp index ad6e008..8cec844 100644 --- a/WebCore/platform/android/ScreenAndroid.cpp +++ b/WebCore/platform/android/ScreenAndroid.cpp @@ -35,9 +35,9 @@ #include "FloatRect.h" #include "Widget.h" -#include "ui/DisplayInfo.h" -#include "ui/PixelFormat.h" -#include "ui/SurfaceComposerClient.h" +#include <ui/DisplayInfo.h> +#include <ui/PixelFormat.h> +#include <surfaceflinger/SurfaceComposerClient.h> namespace WebCore { diff --git a/WebKit/android/plugins/ANPSurfaceInterface.cpp b/WebKit/android/plugins/ANPSurfaceInterface.cpp index 6104910..cb32ed5 100644 --- a/WebKit/android/plugins/ANPSurfaceInterface.cpp +++ b/WebKit/android/plugins/ANPSurfaceInterface.cpp @@ -32,7 +32,7 @@ #include "SkANP.h" #include "android_graphics.h" #include <JNIUtility.h> -#include <ui/Surface.h> +#include <surfaceflinger/Surface.h> #include <ui/Rect.h> #include <ui/Region.h> #include <utils/RefBase.h> |