talk/libjingle.gyp - Issue 1323453002: VideoCapturerAndroid: Move to android folder and split out camera enumeration into separate file

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

Issue 1323453002: VideoCapturerAndroid: Move to android folder and split out camera enumeration into separate file (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 5 years, 4 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

« no previous file with comments | « talk/app/webrtc/java/src/org/webrtc/VideoCapturerAndroid.java ('k') | webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/libjingle.gyp

diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp

index f268be678f8e084ee4096c03c11bff063bf577f6..5a61ca4ee8d8820bd1ad0c1434907bd462571767 100755

--- a/talk/libjingle.gyp

+++ b/talk/libjingle.gyp

@@ -140,15 +140,16 @@

# included here, or better yet, build a proper .jar in webrtc

# and include it here.

'android_java_files': [

+ 'app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java',

'app/webrtc/java/android/org/webrtc/EglBase.java',

'app/webrtc/java/android/org/webrtc/GlRectDrawer.java',

'app/webrtc/java/android/org/webrtc/GlShader.java',

'app/webrtc/java/android/org/webrtc/GlUtil.java',

'app/webrtc/java/android/org/webrtc/RendererCommon.java',

+ 'app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java',

'app/webrtc/java/android/org/webrtc/VideoRendererGui.java',

- 'app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java',

'app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java',

- 'app/webrtc/java/src/org/webrtc/VideoCapturerAndroid.java',

+ 'app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java',

'<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java',

'<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java',

'<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java',