commit 8176cf232e9f613a2e500f09461fc3f448267d07
author Tianjie Xu <xunchang@google.com> Tue Oct 18 14:13:07 2016 -0700
committer Tianjie Xu <xunchang@google.com> Tue Oct 18 21:31:04 2016 +0000
tree 7bef9898660d13fc74dbe528bc0331950fe19604
parent 430b7ae4699eb3685dcc0f7c736a9aebd76829a8
parent 6fba98ce645bb00b4fa7f03dd1786566af919d78

resolve merge conflicts of 6fba98c to stage-aosp-master

Change-Id: I2fa8b85109309ec88c1f8d8def593aa65ab885d7

Android.mk

diff --git a/Android.mk b/Android.mk
index 363f2df..dbc5603 100644
--- a/Android.mk
+++ b/Android.mk
@@ -77,7 +77,8 @@
     libbootloader_message \
     libext4_utils_static \
     libsparse_static \
-    libminzip \
+    libziparchive \
+    libotautil \
     libmounts \
     libz \
     libminadbd \
@@ -155,8 +156,8 @@
     $(LOCAL_PATH)/edify/Android.mk \
     $(LOCAL_PATH)/minadbd/Android.mk \
     $(LOCAL_PATH)/minui/Android.mk \
-    $(LOCAL_PATH)/minzip/Android.mk \
     $(LOCAL_PATH)/otafault/Android.mk \
+    $(LOCAL_PATH)/otautil/Android.mk \
     $(LOCAL_PATH)/tests/Android.mk \
     $(LOCAL_PATH)/tools/Android.mk \
     $(LOCAL_PATH)/uncrypt/Android.mk \