diff options
| author | Mathias Agopian <mathias@google.com> | 2012-02-17 19:26:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-17 19:26:39 -0800 |
| commit | 4e753e08d146ecd1a45a4402bb6b2e392d890a33 (patch) | |
| tree | c1582cf9921228dbe1ad29154f92a38554960af8 /libs/utils/AssetManager.cpp | |
| parent | e8585b1721b84798c4e7413939fd085f7a39bc0e (diff) | |
| parent | b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 (diff) | |
| download | frameworks_base-4e753e08d146ecd1a45a4402bb6b2e392d890a33.zip frameworks_base-4e753e08d146ecd1a45a4402bb6b2e392d890a33.tar.gz frameworks_base-4e753e08d146ecd1a45a4402bb6b2e392d890a33.tar.bz2 | |
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 47a2b99..4829add 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> |