commit d9f7a05830e48f42669df1fca0be03e279b12dc0
author Sriram Raman <sriramkraman@google.com> Tue Jun 09 16:09:43 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jun 09 16:09:43 2009 -0700
tree 77dc0280c6ccf6474d72a719118a5185b06d3ead
parent 835a2756ec61b3046820c2da0ceb8de2c342a790
parent f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf

am f1a55f8b: Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip

Merge commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf'

* commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf':
  Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index f3382c3..eccdfc9 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1224,7 +1224,7 @@
       echo Missing file $$f; \
       exit 1; \
     fi; \
-    unzip -q $$f -d $(2); \
+    unzip -qo $$f -d $(2); \
     (cd $(2) && rm -rf META-INF); \
   done
 endef