split libsurfaceflinger_client and libcamera_client out of libui
diff --git a/Android.mk b/Android.mk
index b9cd7e8..c0afa4e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -244,7 +244,8 @@
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>
