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

diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk
index 8ed60df..9763bd2 100644 (file)
--- 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 (file)
--- 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"