diff options
| author | 2012-02-17 19:26:39 -0800 | |
|---|---|---|
| committer | 2012-02-17 19:26:39 -0800 | |
| commit | 0af7a6097887f55f1fe9c29ddfd927618a02e561 (patch) | |
| tree | fec82fad36d949d2f8cca13cd0a37bb034643ac0 /libs/utils/AssetManager.cpp | |
| parent | 5d98b5c2eb79a112edfed6d66056aad7d09a5fc4 (diff) | |
| parent | a3a38812087f7ac19bb5cc79ceb7b80384d6bd2e (diff) | |
Merge "frameworks/base refactoring."
Diffstat (limited to 'libs/utils/AssetManager.cpp')
| -rw-r--r-- | libs/utils/AssetManager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp index 47a2b9953f..4829addecf 100644 --- a/libs/utils/AssetManager.cpp +++ b/libs/utils/AssetManager.cpp @@ -21,23 +21,23 @@ #define LOG_TAG "asset" //#define LOG_NDEBUG 0 -#include <utils/AssetManager.h> -#include <utils/AssetDir.h> -#include <utils/Asset.h> +#include <androidfw/Asset.h> +#include <androidfw/AssetDir.h> +#include <androidfw/AssetManager.h> +#include <androidfw/ResourceTypes.h> +#include <androidfw/ZipFileRO.h> #include <utils/Atomic.h> +#include <utils/Log.h> #include <utils/String8.h> -#include <utils/ResourceTypes.h> #include <utils/String8.h> -#include <utils/ZipFileRO.h> -#include <utils/Log.h> -#include <utils/Timers.h> #include <utils/threads.h> +#include <utils/Timers.h> +#include <assert.h> #include <dirent.h> #include <errno.h> -#include <assert.h> -#include <strings.h> #include <fcntl.h> +#include <strings.h> #include <sys/stat.h> #include <unistd.h> |