Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1215)

Unified Diff: talk/libjingle.gyp

Issue 1335103004: Log to the webrtc log stream from webrtc/modules java code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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: talk/libjingle.gyp
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index d9133d117c9fe6adefb2fe9f5a93bd69744e170a..0747788f58925b08aea6b4e3ec724e9518fc4bc5 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -113,6 +113,7 @@
{
'variables': {
'java_src_dir': 'app/webrtc/java/src',
+ 'webrtc_base_dir': '<(webrtc_root)/base',
'webrtc_modules_dir': '<(webrtc_root)/modules',
'build_jar_log': '<(INTERMEDIATE_DIR)/build_jar.log',
'peerconnection_java_files': [
@@ -121,7 +122,6 @@
'app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink.java',
'app/webrtc/java/src/org/webrtc/DataChannel.java',
'app/webrtc/java/src/org/webrtc/IceCandidate.java',
- 'app/webrtc/java/src/org/webrtc/Logging.java',
'app/webrtc/java/src/org/webrtc/MediaConstraints.java',
'app/webrtc/java/src/org/webrtc/MediaSource.java',
'app/webrtc/java/src/org/webrtc/MediaStream.java',
@@ -136,6 +136,7 @@
'app/webrtc/java/src/org/webrtc/VideoRenderer.java',
'app/webrtc/java/src/org/webrtc/VideoSource.java',
'app/webrtc/java/src/org/webrtc/VideoTrack.java',
+ '<(webrtc_base_dir)/java/src/org/webrtc/Logging.java',
],
# TODO(fischman): extract this into a webrtc gyp var that can be
Henrik Grunell WebRTC 2015/09/16 07:19:59 Nit: maybe add similar a todo for peerconnection_j
jiayl2 2015/09/16 17:26:04 Done
# included here, or better yet, build a proper .jar in webrtc
@@ -218,9 +219,11 @@
],
'variables': {
'java_in_dir': 'app/webrtc/java',
+ 'webrtc_base_dir': '<(webrtc_root)/base',
'webrtc_modules_dir': '<(webrtc_root)/modules',
'additional_src_dirs' : [
'app/webrtc/java/android',
+ '<(webrtc_base_dir)/java/src',
'<(webrtc_modules_dir)/audio_device/android/java/src',
'<(webrtc_modules_dir)/video_capture/android/java/src',
'<(webrtc_modules_dir)/video_render/android/java/src',

Powered by Google App Engine
This is Rietveld 408576698