Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4338)

Unified Diff: build/android/gyp/util/build_utils.py

Issue 1075143003: Prevent spurious warning during the android build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/util/build_utils.py
diff --git a/build/android/gyp/util/build_utils.py b/build/android/gyp/util/build_utils.py
index aa0b8ec4dcda4bffd8ef60a854959b690c344460..65b1a643c26a2ca920ff176af40bfcad85057f3d 100644
--- a/build/android/gyp/util/build_utils.py
+++ b/build/android/gyp/util/build_utils.py
@@ -236,6 +236,7 @@ def ZipDir(output, base_dir):
def MergeZips(output, inputs, exclude_patterns=None):
+ added_names = set()
def Allow(name):
if exclude_patterns is not None:
for p in exclude_patterns:
@@ -247,8 +248,9 @@ def MergeZips(output, inputs, exclude_patterns=None):
for in_file in inputs:
with zipfile.ZipFile(in_file, 'r') as in_zip:
for name in in_zip.namelist():
- if Allow(name):
+ if name not in added_names and Allow(name):
out_zip.writestr(name, in_zip.read(name))
+ added_names.add(name)
def PrintWarning(message):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698