content/content_shell.gypi - Issue 10986094: Make java.gypi use all_dependent_settings for input_jars_paths

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: content/content_shell.gypi

Issue 10986094: Make java.gypi use all_dependent_settings for input_jars_paths (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_combine

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

Index: content/content_shell.gypi

diff --git a/content/content_shell.gypi b/content/content_shell.gypi

index 093a5e4cfbdd181d79f6aa565d8c501a3e336421..48f252b05223728b3b75a8507d2e54dad3f37635 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -612,14 +612,10 @@

'../net/net.gyp:net_java',

'../ui/ui.gyp:ui_java',

- 'export_dependent_settings': [

- 'content_java',

- '../base/base.gyp:base_java',

- '../media/media.gyp:media_java',

- '../net/net.gyp:net_java',

- '../ui/ui.gyp:ui_java',

- ],

- 'direct_dependent_settings': {

+ # This all_dependent_settings is used for java targets only. This will

+ # add the content_shell jar to the classpath of dependent java

+ # targets.

+ 'all_dependent_settings': {

'variables': {

'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_content_shell.jar'],

« no previous file with comments | « content/content.gyp ('k') | net/net.gyp » ('j') | no next file with comments »