summaryrefslogtreecommitdiffstats
path: root/libs/androidfw/Asset.cpp
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-03-22 18:43:07 -0700
committerColin Cross <ccross@android.com>2012-03-22 18:43:07 -0700
commita982dc05d7ca919c07f50e446549ef9dceadf6bd (patch)
treee9b0e1564069bf39447db97b966a01c6dda66609 /libs/androidfw/Asset.cpp
parent54c546223cd550d2995ec6d956a8e7963311a0a6 (diff)
downloadframeworks_base-a982dc05d7ca919c07f50e446549ef9dceadf6bd.zip
frameworks_base-a982dc05d7ca919c07f50e446549ef9dceadf6bd.tar.gz
frameworks_base-a982dc05d7ca919c07f50e446549ef9dceadf6bd.tar.bz2
frameworks/base: move Zip* from libandroidfw to libutils
ZipUtils is needed by build/tools, move it from libandroidfw (frameworks/base) to libutils (frameworks/native). Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
Diffstat (limited to 'libs/androidfw/Asset.cpp')
-rw-r--r--libs/androidfw/Asset.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp
index cb7628d..fd5b3e4 100644
--- a/libs/androidfw/Asset.cpp
+++ b/libs/androidfw/Asset.cpp
@@ -23,11 +23,11 @@
#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/Log.h>
+#include <utils/ZipFileRO.h>
+#include <utils/ZipUtils.h>
#include <utils/threads.h>
#include <assert.h>