base/base.gyp - Issue 12385066: Fix downstream android webview build

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: base/base.gyp

Issue 12385066: Fix downstream android webview build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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: base/base.gyp

diff --git a/base/base.gyp b/base/base.gyp

index aa753c0cddec4d7db49a524fa75027d693e9eee8..f75c7c2b3966854dcfe83f2acca83660f8c98151 100644

--- a/base/base.gyp

+++ b/base/base.gyp

@@ -1119,13 +1119,17 @@

{

'target_name': 'base_java',

'type': 'none',

- 'dependencies': [

- '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',

- ],

'variables': {

'java_in_dir': '../base/android/java',

'includes': [ '../build/java.gypi' ],

+ 'conditions': [

+ ['android_build_type==0', {

+ 'dependencies': [

+ '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',

+ ],

+ }]

+ ],

{

'target_name': 'base_java_test_support',

« no previous file with comments | « no previous file | no next file » | no next file with comments »