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

Unified Diff: build/android/gyp/write_build_config.py

Issue 2864693002: (Reland x3) Expose resources in Robolectric/JUnit tests. (Closed)
Patch Set: Created 3 years, 7 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 | « build/android/gyp/create_test_runner_script.py ('k') | build/android/pylib/junit/junit_test_instance.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..2da62f84eb8a07a1d3347fbdfce5d0220a368b4e 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,8 @@ 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 in (
+ 'android_resources', 'android_apk', 'junit_binary', 'resource_rewriter'):
config['resources'] = {}
config['resources']['dependency_zips'] = [
c['resources_zip'] for c in all_resources_deps]
« no previous file with comments | « build/android/gyp/create_test_runner_script.py ('k') | build/android/pylib/junit/junit_test_instance.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698