From f14d85d6fcb740930f15325611609406d658684c Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Mon, 6 May 2013 20:19:54 -0700
Subject: [PATCH] libutils clean-up

Change-Id: I93a0fef582580282d62379ddba3ae2d50f3ea0c5
---
 tools/zipalign/Android.mk  | 1 +
 tools/zipalign/ZipFile.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk
index 5542280397..708c8bf92b 100644
--- a/tools/zipalign/Android.mk
+++ b/tools/zipalign/Android.mk
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES += external/zlib
 
 LOCAL_STATIC_LIBRARIES := \
+	libandroidfw \
 	libutils \
 	libcutils \
 	liblog
diff --git a/tools/zipalign/ZipFile.cpp b/tools/zipalign/ZipFile.cpp
index 3994c3190a..8057068dd6 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"