Chromium Code Reviews| Index: build/android/gyp/write_build_config.py |
| diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py |
| index 2303dc54afc8fc539038103ecd5313bbfd5e71e2..dbb3c66dc0aaa428f632de06c9577c65154b5ac9 100755 |
| --- a/build/android/gyp/write_build_config.py |
| +++ b/build/android/gyp/write_build_config.py |
| @@ -344,6 +344,7 @@ def main(argv): |
| 'dist_jar': ['build_config'], |
| 'resource_rewriter': ['build_config'], |
| 'group': ['build_config'], |
| + 'junit_binary': ['build_config'], |
| } |
| required_options = required_options_map.get(options.type) |
| if not required_options: |
| @@ -540,7 +541,13 @@ def main(argv): |
| deps_info['owned_resources_dirs'] = list(owned_resource_dirs) |
| deps_info['owned_resources_zips'] = list(owned_resource_zips) |
| - if options.type in ('android_resources','android_apk', 'resource_rewriter'): |
| + if options.type == 'junit_binary': |
| + config['test_info'] = {} |
| + config['test_info']['resources_dirs'] = [ |
|
agrieve
2017/04/11 00:25:03
This hurts my head to look at :P. Better to just u
mikecase (-- gone --)
2017/04/11 18:04:31
Done
|
| + d for c in all_resources_deps if 'resources_dirs' in c |
| + for d in c['resources_dirs']] |
| + |
| + if options.type in ('android_resources', 'android_apk', 'resource_rewriter'): |
| config['resources'] = {} |
| config['resources']['dependency_zips'] = [ |
| c['resources_zip'] for c in all_resources_deps] |