summaryrefslogtreecommitdiff
path: root/libs/utils/Asset.cpp
diff options
context:
space:
mode:
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
commit4e753e08d146ecd1a45a4402bb6b2e392d890a33 (patch)
treec1582cf9921228dbe1ad29154f92a38554960af8 /libs/utils/Asset.cpp
parente8585b1721b84798c4e7413939fd085f7a39bc0e (diff)
parentb13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 (diff)
Merge "frameworks/base refactoring."
Diffstat (limited to 'libs/utils/Asset.cpp')
-rw-r--r--libs/utils/Asset.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/utils/Asset.cpp b/libs/utils/Asset.cpp
index 50e701aa8d89..cb7628d1d5b1 100644
--- a/libs/utils/Asset.cpp
+++ b/libs/utils/Asset.cpp
@@ -21,23 +21,23 @@
#define LOG_TAG "asset"
//#define NDEBUG 0
-#include <utils/Asset.h>
+#include <androidfw/Asset.h>
+#include <androidfw/StreamingZipInflater.h>
+#include <androidfw/ZipFileRO.h>
+#include <androidfw/ZipUtils.h>
#include <utils/Atomic.h>
#include <utils/FileMap.h>
-#include <utils/StreamingZipInflater.h>
-#include <utils/ZipUtils.h>
-#include <utils/ZipFileRO.h>
#include <utils/Log.h>
#include <utils/threads.h>
-#include <string.h>
-#include <memory.h>
-#include <fcntl.h>
-#include <errno.h>
#include <assert.h>
-#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <memory.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <unistd.h>
using namespace android;