| Index: build/android/process_resources.py
|
| diff --git a/build/android/process_resources.py b/build/android/process_resources.py
|
| index c6619c52935fbc940d88b5fb45d128f8e98f1334..541fb56063ed8fd523cfd8e9b6786a79f8140b2c 100755
|
| --- a/build/android/process_resources.py
|
| +++ b/build/android/process_resources.py
|
| @@ -9,7 +9,6 @@
|
| import optparse
|
| import os
|
| import shlex
|
| -import subprocess
|
|
|
| from pylib import build_utils
|
|
|
| @@ -80,17 +79,20 @@ def main():
|
| package_command.append('--non-constant-id')
|
| if options.custom_package:
|
| package_command += ['--custom-package', options.custom_package]
|
| - subprocess.check_call(package_command)
|
| + build_utils.CheckCallDie(package_command)
|
|
|
| # Crunch image resources. This shrinks png files and is necessary for 9-patch
|
| # images to display correctly.
|
| build_utils.MakeDirectory(options.crunch_output_dir)
|
| - subprocess.check_call([aapt,
|
| - 'crunch',
|
| - '-S', options.crunch_input_dir,
|
| - '-C', options.crunch_output_dir])
|
|
|
| - build_utils.Touch(options.stamp)
|
| + aapt_cmd = [aapt,
|
| + 'crunch',
|
| + '-S', options.crunch_input_dir,
|
| + '-C', options.crunch_output_dir]
|
| + build_utils.CheckCallDie(aapt_cmd)
|
| +
|
| + if options.stamp:
|
| + build_utils.Touch(options.stamp)
|
|
|
|
|
| if __name__ == '__main__':
|
|
|