From a54eb7fa1e850d7096f97065f35ed00bcb5384d3 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Fri, 17 Feb 2012 18:21:13 -0800
Subject: frameworks/base refactoring.

step 2: move libutils headers to their new home in androidfw.

Change-Id: I5e97cfccf6828bc37207b92fbfe301b1ca31df4c
---
 Source/WebCore/platform/graphics/android/ImageAndroid.cpp         | 2 +-
 Source/WebCore/platform/text/android/HyphenationAndroid.cpp       | 2 +-
 Source/WebKit/android/RenderSkinAndroid.cpp                       | 4 ++--
 Source/WebKit/android/RenderSkinMediaButton.cpp                   | 2 +-
 Source/WebKit/android/RenderSkinNinePatch.cpp                     | 8 ++++----
 Source/WebKit/android/RenderSkinNinePatch.h                       | 2 +-
 Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 +-
 Source/WebKit/android/WebCoreSupport/WebRequest.cpp               | 2 +-
 Source/WebKit/android/jni/WebCoreFrameBridge.cpp                  | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Source/WebCore/platform/graphics/android/ImageAndroid.cpp b/Source/WebCore/platform/graphics/android/ImageAndroid.cpp
index 01fe272..8e0c112 100644
--- a/Source/WebCore/platform/graphics/android/ImageAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/ImageAndroid.cpp
@@ -44,7 +44,7 @@
 #include "SkTemplates.h"
 #include "SkiaUtils.h"
 
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
 
 //#define TRACE_SUBSAMPLED_BITMAPS
 //#define TRACE_SKIPPED_BITMAPS
diff --git a/Source/WebCore/platform/text/android/HyphenationAndroid.cpp b/Source/WebCore/platform/text/android/HyphenationAndroid.cpp
index d1bd839..9933715 100644
--- a/Source/WebCore/platform/text/android/HyphenationAndroid.cpp
+++ b/Source/WebCore/platform/text/android/HyphenationAndroid.cpp
@@ -28,7 +28,7 @@
 
 // For external hyphenation library.
 #include "hyphen.h"
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
diff --git a/Source/WebKit/android/RenderSkinAndroid.cpp b/Source/WebKit/android/RenderSkinAndroid.cpp
index 9a5a206..9529624 100644
--- a/Source/WebKit/android/RenderSkinAndroid.cpp
+++ b/Source/WebKit/android/RenderSkinAndroid.cpp
@@ -30,8 +30,8 @@
 #include "RenderSkinMediaButton.h"
 #include "SkImageDecoder.h"
 
-#include <utils/AssetManager.h>
-#include <utils/Asset.h>
+#include <androidfw/AssetManager.h>
+#include <androidfw/Asset.h>
 
 namespace WebCore {
 
diff --git a/Source/WebKit/android/RenderSkinMediaButton.cpp b/Source/WebKit/android/RenderSkinMediaButton.cpp
index f99c731..febf575 100644
--- a/Source/WebKit/android/RenderSkinMediaButton.cpp
+++ b/Source/WebKit/android/RenderSkinMediaButton.cpp
@@ -36,7 +36,7 @@
 #include "SkCanvas.h"
 #include "SkNinePatch.h"
 #include "SkRect.h"
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
 #include <utils/Debug.h>
 #include <utils/Log.h>
 #include <wtf/text/CString.h>
diff --git a/Source/WebKit/android/RenderSkinNinePatch.cpp b/Source/WebKit/android/RenderSkinNinePatch.cpp
index d9f6011..ec748f7 100644
--- a/Source/WebKit/android/RenderSkinNinePatch.cpp
+++ b/Source/WebKit/android/RenderSkinNinePatch.cpp
@@ -16,18 +16,18 @@
 
 #include "config.h"
 
-#include "RenderSkinNinePatch.h"
 #include "NinePatchPeeker.h"
+#include "RenderSkinNinePatch.h"
 #include "SkCanvas.h"
 #include "SkImageDecoder.h"
 #include "SkNinePatch.h"
 #include "SkRect.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
-#include <utils/Asset.h>
-#include <utils/AssetManager.h>
+#include <androidfw/Asset.h>
+#include <androidfw/AssetManager.h>
+#include <androidfw/ResourceTypes.h>
 #include <utils/Log.h>
-#include <utils/ResourceTypes.h>
 
 class SkPaint;
 class SkRegion;
diff --git a/Source/WebKit/android/RenderSkinNinePatch.h b/Source/WebKit/android/RenderSkinNinePatch.h
index e4db260..8cda795 100644
--- a/Source/WebKit/android/RenderSkinNinePatch.h
+++ b/Source/WebKit/android/RenderSkinNinePatch.h
@@ -18,7 +18,7 @@
 #define RenderSkinNinePatch_h
 
 #include "SkBitmap.h"
-#include "utils/Asset.h"
+#include "androidfw/Asset.h"
 
 namespace android {
     class AssetManager;
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index d26d523..64799a8 100644
--- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -79,7 +79,7 @@
 #include "autofill/WebAutofill.h"
 #include "android_graphics.h"
 
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
 #include <wtf/text/CString.h>
 
 #define verifiedOk() // Verified that we don't need to implement this.
diff --git a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
index c239b80..fea7afa 100644
--- a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
@@ -39,7 +39,7 @@
 #include <cutils/log.h>
 #include <openssl/x509.h>
 #include <string>
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
 
 extern android::AssetManager* globalAssetManager();
 
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index c7db722..50c1fb2 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -101,7 +101,7 @@
 #include <android_runtime/android_util_AssetManager.h>
 #include <openssl/x509.h>
 #include <utils/misc.h>
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/Platform.h>
 #include <wtf/text/AtomicString.h>
-- 
cgit v1.1