diff options
| author | 2012-02-17 18:27:36 -0800 | |
|---|---|---|
| committer | 2012-02-17 19:01:26 -0800 | |
| commit | b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 (patch) | |
| tree | 2b90dc39a35d8081ea47b038893624b69a01202d /tools/aapt | |
| parent | 6db0608dff408130b35e6f21abe746a635648b18 (diff) | |
frameworks/base refactoring.
step 2: move libutils headers to their new home: androidfw
Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/AaptAssets.h | 8 | ||||
| -rw-r--r-- | tools/aapt/Images.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 2 | ||||
| -rw-r--r-- | tools/aapt/StringPool.h | 2 | ||||
| -rw-r--r-- | tools/aapt/ZipFile.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tools/aapt/AaptAssets.h b/tools/aapt/AaptAssets.h index 1c653e1fb77a..59249529fbba 100644 --- a/tools/aapt/AaptAssets.h +++ b/tools/aapt/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/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index ffbe875b72f7..6402e3cb38d8 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/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/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 7a0499c476d7..0c0b2ea0765f 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/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/tools/aapt/StringPool.h b/tools/aapt/StringPool.h index 255bdbfc0a7f..86044ed1ad2b 100644 --- a/tools/aapt/StringPool.h +++ b/tools/aapt/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/tools/aapt/ZipFile.cpp b/tools/aapt/ZipFile.cpp index 0705be3380db..8057068dd685 100644 --- a/tools/aapt/ZipFile.cpp +++ b/tools/aapt/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" |