commit e3a8b62d7959ecce002b6a60296512f38f6baff5
author Stephen Hines <srhines@google.com> Fri Mar 23 05:33:17 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 23 05:33:17 2012 -0700
tree 3ed820f0de96be589f03fda25ee1f93f4c481a00
parent 0bf80735eceecb02141655d7295f0ff5301a75a7
parent 62304f1ec3557be82f3ec1be51e2a870d59022dc

Merge "Make sure compiler flags also pick up correct toolchain."

tools/zipalign/Android.mk

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_C_INCLUDES += external/zlib
 
 LOCAL_STATIC_LIBRARIES := \
-	libandroidfw \
 	libutils \
 	libcutils
 

tools/zipalign/ZipFile.cpp

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"