build/android/gyp/write_build_config.py - Issue 2824863002: Revert of (Reland) Expose resources in Robolectric/JUnit tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2824863002: Revert of (Reland) Expose resources in Robolectric/JUnit tests. (Closed)

Patch Set: Created 3 years, 8 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:

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 2da62f84eb8a07a1d3347fbdfce5d0220a368b4e..2303dc54afc8fc539038103ecd5313bbfd5e71e2 100755

--- a/build/android/gyp/write_build_config.py

+++ b/build/android/gyp/write_build_config.py

@@ -344,7 +344,6 @@

'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:

@@ -541,8 +540,7 @@

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', 'junit_binary', 'resource_rewriter'):

+ 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]