all.gyp - Issue 2080563002: Workaround java.gypi inclusion error in Chromium builds.

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: all.gyp

Issue 2080563002: Workaround java.gypi inclusion error in Chromium builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Changes to all.gyp Created 4 years, 6 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: all.gyp

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

index abf6e6860d16935b4cb6fe9f044addc571304fe3..238229063e6a6be66222adda2afcb522b2edc6fb 100644

--- a/all.gyp

+++ b/all.gyp

@@ -36,6 +36,11 @@

'<(webrtc_vp9_dir)/vp9.gyp:*',

'conditions': [

+ ['OS=="android" and build_with_chromium==0', {

+ 'dependencies': [

+ 'webrtc/api/api_java.gyp:*',

+ ],

+ }],

['include_tests==1', {

'includes': [

'webrtc/webrtc_tests.gypi',

« no previous file with comments | « no previous file | webrtc/api/api.gyp » ('j') | no next file with comments »