summaryrefslogtreecommitdiffstats
path: root/tools/zipalign
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-03-22 18:47:23 -0700
committerColin Cross <ccross@android.com>2012-03-22 18:47:23 -0700
commit0bf80735eceecb02141655d7295f0ff5301a75a7 (patch)
tree43093a53a62d46c748a4a9593594b34500f7fd10 /tools/zipalign
parentd6bfbb652f3e99c0f533f34f15f12e0770880556 (diff)
downloadbuild-0bf80735eceecb02141655d7295f0ff5301a75a7.zip
build-0bf80735eceecb02141655d7295f0ff5301a75a7.tar.gz
build-0bf80735eceecb02141655d7295f0ff5301a75a7.tar.bz2
build: move Zip* from libandroidfw to libutils
ZipUtils is needed by build/tools, move it from libandroidfw (frameworks/base) to libutils (frameworks/native). Change-Id: I188247d058f1baa0ebd14282208d496c4ba061be
Diffstat (limited to 'tools/zipalign')
-rw-r--r--tools/zipalign/Android.mk1
-rw-r--r--tools/zipalign/ZipFile.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk
index 8ed60df..9763bd2 100644
--- a/tools/zipalign/Android.mk
+++ b/tools/zipalign/Android.mk
@@ -15,7 +15,6 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES += external/zlib
LOCAL_STATIC_LIBRARIES := \
- libandroidfw \
libutils \
libcutils
diff --git a/tools/zipalign/ZipFile.cpp b/tools/zipalign/ZipFile.cpp
index 8057068..3994c31 100644
--- a/tools/zipalign/ZipFile.cpp
+++ b/tools/zipalign/ZipFile.cpp
@@ -20,8 +20,8 @@
#define LOG_TAG "zip"
-#include <androidfw/ZipUtils.h>
#include <utils/Log.h>
+#include <utils/ZipUtils.h>
#include "ZipFile.h"