webrtc/build/android_tests.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: webrtc/build/android_tests.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.

Jump to:

View side-by-side diff with in-line comments

Index: webrtc/build/android_tests.gyp

diff --git a/webrtc/build/android_tests.gyp b/webrtc/build/android_tests.gyp

index fdf72737a104fbcf3ae4511ccd9c10002d5807f2..7803b9a4198859247b37b46a5999d7bec11037f7 100644

--- a/webrtc/build/android_tests.gyp

+++ b/webrtc/build/android_tests.gyp

@@ -126,7 +126,7 @@

'dependencies': [

'<(webrtc_root)/api/api_tests.gyp:peerconnection_unittests',

- '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_java',

+ '<(webrtc_root)/api/api_java.gyp:libjingle_peerconnection_java',

'includes': [

'../../build/apk_test.gypi',

@@ -264,7 +264,7 @@

'target_name': 'android_junit_tests',

'type': 'none',

'dependencies': [

- '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_java',

+ '<(webrtc_root)/api/api_java.gyp:libjingle_peerconnection_java',

'<(DEPTH)/base/base.gyp:base_java',

'<(DEPTH)/base/base.gyp:base_java_test_support',

'<(DEPTH)/base/base.gyp:base_junit_test_support',

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