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

Side by Side Diff: build/android/gyp/util/proguard_util.py

Issue 2102763002: Removed unnecessary assertion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 import re 6 import re
7 from util import build_utils 7 from util import build_utils
8 8
9 9
10 class _ProguardOutputFilter(object): 10 class _ProguardOutputFilter(object):
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 if self._cmd: 91 if self._cmd:
92 return self._cmd 92 return self._cmd
93 assert self._injars is not None 93 assert self._injars is not None
94 assert self._outjar is not None 94 assert self._outjar is not None
95 assert self._configs is not None 95 assert self._configs is not None
96 cmd = [ 96 cmd = [
97 'java', '-jar', self._proguard_jar_path, 97 'java', '-jar', self._proguard_jar_path,
98 '-forceprocessing', 98 '-forceprocessing',
99 ] 99 ]
100 if self._tested_apk_info_path: 100 if self._tested_apk_info_path:
101 assert len(self._configs) == 1
102 tested_apk_info = build_utils.ReadJson(self._tested_apk_info_path) 101 tested_apk_info = build_utils.ReadJson(self._tested_apk_info_path)
103 self._configs += tested_apk_info['configs'] 102 self._configs += tested_apk_info['configs']
104 self._injars = [ 103 self._injars = [
105 p for p in self._injars if not p in tested_apk_info['inputs']] 104 p for p in self._injars if not p in tested_apk_info['inputs']]
106 if not self._libraries: 105 if not self._libraries:
107 self._libraries = [] 106 self._libraries = []
108 self._libraries += tested_apk_info['inputs'] 107 self._libraries += tested_apk_info['inputs']
109 self._mapping = tested_apk_info['mapping'] 108 self._mapping = tested_apk_info['mapping']
110 cmd += [ 109 cmd += [
111 '-dontobfuscate', 110 '-dontobfuscate',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 stderr_filter=stderr_filter) 179 stderr_filter=stderr_filter)
181 180
182 this_info = { 181 this_info = {
183 'inputs': self._injars, 182 'inputs': self._injars,
184 'configs': self._configs, 183 'configs': self._configs,
185 'mapping': self._outjar + '.mapping', 184 'mapping': self._outjar + '.mapping',
186 } 185 }
187 186
188 build_utils.WriteJson(this_info, self._outjar + '.info') 187 build_utils.WriteJson(this_info, self._outjar + '.info')
189 188
OLDNEW
« 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