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 1c653e1fb77ae55a86f785f1f0cc4732804c543d..59249529fbbab19d2d54b566c09dcd3b7a1643da 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -7,14 +7,14 @@
 #define __AAPT_ASSETS_H
 
 #include <stdlib.h>
 #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/KeyedVector.h>

-#include <utils/String8.h>
-#include <utils/ResourceTypes.h>
+#include <utils/RefBase.h>

 #include <utils/SortedVector.h>
 #include <utils/String8.h>
 #include <utils/SortedVector.h>
 #include <utils/String8.h>

+#include <utils/String8.h>

 #include <utils/Vector.h>
 #include <utils/Vector.h>

-#include <utils/RefBase.h>

 #include "ZipFile.h"
 
 #include "Bundle.h"
 #include "ZipFile.h"
 
 #include "Bundle.h"

diff --git a/Images.cpp b/Images.cpp
index ffbe875b72f772b66766c35aac8b9305a60b0e3a..6402e3cb38d8ca6e0b3612a4e2efb9e244e2a581 100644 (file)
--- a/Images.cpp
+++ b/Images.cpp
@@ -8,7 +8,7 @@
 
 #include "Images.h"
 
 
 #include "Images.h"
 

-#include <utils/ResourceTypes.h>
+#include <androidfw/ResourceTypes.h>

 #include <utils/ByteOrder.h>
 
 #include <png.h>
 #include <utils/ByteOrder.h>
 
 #include <png.h>

diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index 7a0499c476d7020eee6df216b6134caf3baa5942..0c0b2ea0765f6e330d776ed05f9142308b5bab8e 100644 (file)
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -9,8 +9,8 @@
 #include "XMLNode.h"
 #include "ResourceFilter.h"
 
 #include "XMLNode.h"
 #include "ResourceFilter.h"
 

+#include <androidfw/ResourceTypes.h>

 #include <utils/ByteOrder.h>
 #include <utils/ByteOrder.h>

-#include <utils/ResourceTypes.h>

 #include <stdarg.h>
 
 #define NOISY(x) //x
 #include <stdarg.h>
 
 #define NOISY(x) //x

diff --git a/StringPool.h b/StringPool.h
index 255bdbfc0a7f7a5bf194702e49501f5ddfff900e..86044ed1ad2b2bb0a278294ca3a7d13d68623b84 100644 (file)
--- a/StringPool.h
+++ b/StringPool.h
@@ -10,7 +10,7 @@
 #include "Main.h"
 #include "AaptAssets.h"
 
 #include "Main.h"
 #include "AaptAssets.h"
 

-#include <utils/ResourceTypes.h>
+#include <androidfw/ResourceTypes.h>

 #include <utils/String16.h>
 #include <utils/TextOutput.h>
 
 #include <utils/String16.h>
 #include <utils/TextOutput.h>
 

diff --git a/ZipFile.cpp b/ZipFile.cpp
index 0705be3380dbec3585f8917f200fe41e64c5214a..8057068dd685f96bae5e167b41db6a4598bb6c84 100644 (file)
--- a/ZipFile.cpp
+++ b/ZipFile.cpp
@@ -20,7 +20,7 @@
 
 #define LOG_TAG "zip"
 
 
 #define LOG_TAG "zip"
 

-#include <utils/ZipUtils.h>
+#include <androidfw/ZipUtils.h>

 #include <utils/Log.h>
 
 #include "ZipFile.h"
 #include <utils/Log.h>
 
 #include "ZipFile.h"