From: Mathias Agopian <mathias@google.com>
Date: Sat, 18 Feb 2012 02:27:36 +0000 (-0800)
Subject: frameworks/base refactoring.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/34ceac879a88aac0117323712ee67fad79a561bd?ds=sidebyside

frameworks/base refactoring.

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

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
---

diff --git a/AaptAssets.h b/AaptAssets.h
index 1c653e1..5924952 100644
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -7,14 +7,14 @@
 #define __AAPT_ASSETS_H
 
 #include <stdlib.h>
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
+#include <androidfw/ResourceTypes.h>
 #include <utils/KeyedVector.h>
-#include <utils/String8.h>
-#include <utils/ResourceTypes.h>
+#include <utils/RefBase.h>
 #include <utils/SortedVector.h>
 #include <utils/String8.h>
+#include <utils/String8.h>
 #include <utils/Vector.h>
-#include <utils/RefBase.h>
 #include "ZipFile.h"
 
 #include "Bundle.h"
diff --git a/Images.cpp b/Images.cpp
index ffbe875..6402e3c 100644
--- a/Images.cpp
+++ b/Images.cpp
@@ -8,7 +8,7 @@
 
 #include "Images.h"
 
-#include <utils/ResourceTypes.h>
+#include <androidfw/ResourceTypes.h>
 #include <utils/ByteOrder.h>
 
 #include <png.h>
diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index 7a0499c..0c0b2ea 100644
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -9,8 +9,8 @@
 #include "XMLNode.h"
 #include "ResourceFilter.h"
 
+#include <androidfw/ResourceTypes.h>
 #include <utils/ByteOrder.h>
-#include <utils/ResourceTypes.h>
 #include <stdarg.h>
 
 #define NOISY(x) //x
diff --git a/StringPool.h b/StringPool.h
index 255bdbf..86044ed 100644
--- a/StringPool.h
+++ b/StringPool.h
@@ -10,7 +10,7 @@
 #include "Main.h"
 #include "AaptAssets.h"
 
-#include <utils/ResourceTypes.h>
+#include <androidfw/ResourceTypes.h>
 #include <utils/String16.h>
 #include <utils/TextOutput.h>
 
diff --git a/ZipFile.cpp b/ZipFile.cpp
index 0705be3..8057068 100644
--- a/ZipFile.cpp
+++ b/ZipFile.cpp
@@ -20,7 +20,7 @@
 
 #define LOG_TAG "zip"
 
-#include <utils/ZipUtils.h>
+#include <androidfw/ZipUtils.h>
 #include <utils/Log.h>
 
 #include "ZipFile.h"