diff options
| -rwxr-xr-x | build/android/gyp/apk_obfuscate.py | 3 | ||||
| -rwxr-xr-x | build/android/gyp/proguard.py | 3 | ||||
| -rw-r--r-- | build/android/gyp/util/proguard_util.py | 13 | ||||
| -rw-r--r-- | build/config/android/config.gni | 3 | ||||
| -rw-r--r-- | build/config/android/internal_rules.gni | 3 |
5 files changed, 21 insertions, 4 deletions
diff --git a/build/android/gyp/apk_obfuscate.py b/build/android/gyp/apk_obfuscate.py index f29f091..99b6176 100755 --- a/build/android/gyp/apk_obfuscate.py +++ b/build/android/gyp/apk_obfuscate.py @@ -120,7 +120,8 @@ def DoProguard(options): configs.append(multidex_config) proguard.configs(configs) - proguard.CheckOutput(options.verbose) + proguard.verbose(options.verbose) + proguard.CheckOutput() def _PossibleMultidexConfig(options): diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py index 4bbb5d5..d019350 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py @@ -61,11 +61,12 @@ def main(args): classpath = list(set(options.classpath)) proguard.libraryjars(classpath) + proguard.verbose(options.verbose) input_paths = proguard.GetInputs() build_utils.CallAndWriteDepfileIfStale( - lambda: proguard.CheckOutput(options.verbose), + proguard.CheckOutput, options, input_paths=input_paths, input_strings=proguard.build(), diff --git a/build/android/gyp/util/proguard_util.py b/build/android/gyp/util/proguard_util.py index 70b781d..f315979 100644 --- a/build/android/gyp/util/proguard_util.py +++ b/build/android/gyp/util/proguard_util.py @@ -44,6 +44,7 @@ class ProguardCmdBuilder(object): self._configs = None self._outjar = None self._cmd = None + self._verbose = False def outjar(self, path): assert self._cmd is None @@ -82,6 +83,10 @@ class ProguardCmdBuilder(object): assert os.path.exists(p), p self._configs = paths + def verbose(self, verbose): + assert self._cmd is None + self._verbose = verbose + def build(self): if self._cmd: return self._cmd @@ -134,6 +139,10 @@ class ProguardCmdBuilder(object): '-printusage', self._outjar + '.usage', '-printmapping', self._outjar + '.mapping', ] + + if self._verbose: + cmd.append('-verbose') + self._cmd = cmd return self._cmd @@ -149,7 +158,7 @@ class ProguardCmdBuilder(object): return inputs - def CheckOutput(self, verbose=False): + def CheckOutput(self): self.build() # Proguard will skip writing these files if they would be empty. Create # empty versions of them all now so that they are updated as the build @@ -162,7 +171,7 @@ class ProguardCmdBuilder(object): # to stdout. stdout_filter = None stderr_filter = None - if not verbose: + if not self._verbose: stdout_filter = _ProguardOutputFilter() stderr_filter = _ProguardOutputFilter() build_utils.CheckOutput(self._cmd, print_stdout=True, diff --git a/build/config/android/config.gni b/build/config/android/config.gni index 14857a3..aff3b2f 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -77,6 +77,9 @@ if (is_android) { # run_findbugs is false. findbugs_verbose = false + # Enables verbose proguard output (summaries and unfiltered output). + proguard_verbose = false + # Set to true to enable the Errorprone compiler use_errorprone_java_compiler = false diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 9432170..444e3f6 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -121,6 +121,9 @@ template("proguard") { "--classpath", _rebased_android_sdk_jar, ] + if (proguard_verbose) { + args += [ "--verbose" ] + } if (defined(invoker.args)) { args += invoker.args } |