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

Side by Side 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: sync 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 unified diff | Download patch
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 'app/webrtc/java/jni/androidmediaencoder_jni.h', 104 'app/webrtc/java/jni/androidmediaencoder_jni.h',
105 ] 105 ]
106 }], 106 }],
107 ], 107 ],
108 }, 108 },
109 { 109 {
110 'target_name': 'libjingle_peerconnection_jar', 110 'target_name': 'libjingle_peerconnection_jar',
111 'type': 'none', 111 'type': 'none',
112 'actions': [ 112 'actions': [
113 { 113 {
114 # TODO(jiayl): extract peerconnection_java_files and android_java_ files into a webrtc
115 # gyp var that can be included here, or better yet, build a proper .jar in webrtc
116 # and include it here.
114 'variables': { 117 'variables': {
115 'java_src_dir': 'app/webrtc/java/src', 118 'java_src_dir': 'app/webrtc/java/src',
119 'webrtc_base_dir': '<(webrtc_root)/base',
116 'webrtc_modules_dir': '<(webrtc_root)/modules', 120 'webrtc_modules_dir': '<(webrtc_root)/modules',
117 'build_jar_log': '<(INTERMEDIATE_DIR)/build_jar.log', 121 'build_jar_log': '<(INTERMEDIATE_DIR)/build_jar.log',
118 'peerconnection_java_files': [ 122 'peerconnection_java_files': [
119 'app/webrtc/java/src/org/webrtc/AudioSource.java', 123 'app/webrtc/java/src/org/webrtc/AudioSource.java',
120 'app/webrtc/java/src/org/webrtc/AudioTrack.java', 124 'app/webrtc/java/src/org/webrtc/AudioTrack.java',
121 'app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink .java', 125 'app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink .java',
122 'app/webrtc/java/src/org/webrtc/DataChannel.java', 126 'app/webrtc/java/src/org/webrtc/DataChannel.java',
123 'app/webrtc/java/src/org/webrtc/IceCandidate.java', 127 'app/webrtc/java/src/org/webrtc/IceCandidate.java',
124 'app/webrtc/java/src/org/webrtc/Logging.java',
125 'app/webrtc/java/src/org/webrtc/MediaConstraints.java', 128 'app/webrtc/java/src/org/webrtc/MediaConstraints.java',
126 'app/webrtc/java/src/org/webrtc/MediaSource.java', 129 'app/webrtc/java/src/org/webrtc/MediaSource.java',
127 'app/webrtc/java/src/org/webrtc/MediaStream.java', 130 'app/webrtc/java/src/org/webrtc/MediaStream.java',
128 'app/webrtc/java/src/org/webrtc/MediaStreamTrack.java', 131 'app/webrtc/java/src/org/webrtc/MediaStreamTrack.java',
129 'app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java', 132 'app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java',
130 'app/webrtc/java/src/org/webrtc/PeerConnection.java', 133 'app/webrtc/java/src/org/webrtc/PeerConnection.java',
131 'app/webrtc/java/src/org/webrtc/SdpObserver.java', 134 'app/webrtc/java/src/org/webrtc/SdpObserver.java',
132 'app/webrtc/java/src/org/webrtc/StatsObserver.java', 135 'app/webrtc/java/src/org/webrtc/StatsObserver.java',
133 'app/webrtc/java/src/org/webrtc/StatsReport.java', 136 'app/webrtc/java/src/org/webrtc/StatsReport.java',
134 'app/webrtc/java/src/org/webrtc/SessionDescription.java', 137 'app/webrtc/java/src/org/webrtc/SessionDescription.java',
135 'app/webrtc/java/src/org/webrtc/VideoCapturer.java', 138 'app/webrtc/java/src/org/webrtc/VideoCapturer.java',
136 'app/webrtc/java/src/org/webrtc/VideoRenderer.java', 139 'app/webrtc/java/src/org/webrtc/VideoRenderer.java',
137 'app/webrtc/java/src/org/webrtc/VideoSource.java', 140 'app/webrtc/java/src/org/webrtc/VideoSource.java',
138 'app/webrtc/java/src/org/webrtc/VideoTrack.java', 141 'app/webrtc/java/src/org/webrtc/VideoTrack.java',
142 '<(webrtc_base_dir)/java/src/org/webrtc/Logging.java',
139 ], 143 ],
140 # TODO(fischman): extract this into a webrtc gyp var that can be
141 # included here, or better yet, build a proper .jar in webrtc
142 # and include it here.
143 'android_java_files': [ 144 'android_java_files': [
144 'app/webrtc/java/android/org/webrtc/Camera2Enumerator.java', 145 'app/webrtc/java/android/org/webrtc/Camera2Enumerator.java',
145 'app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.j ava', 146 'app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.j ava',
146 'app/webrtc/java/android/org/webrtc/CameraEnumerator.java', 147 'app/webrtc/java/android/org/webrtc/CameraEnumerator.java',
147 'app/webrtc/java/android/org/webrtc/EglBase.java', 148 'app/webrtc/java/android/org/webrtc/EglBase.java',
148 'app/webrtc/java/android/org/webrtc/GlRectDrawer.java', 149 'app/webrtc/java/android/org/webrtc/GlRectDrawer.java',
149 'app/webrtc/java/android/org/webrtc/GlShader.java', 150 'app/webrtc/java/android/org/webrtc/GlShader.java',
150 'app/webrtc/java/android/org/webrtc/GlUtil.java', 151 'app/webrtc/java/android/org/webrtc/GlUtil.java',
151 'app/webrtc/java/android/org/webrtc/RendererCommon.java', 152 'app/webrtc/java/android/org/webrtc/RendererCommon.java',
152 'app/webrtc/java/android/org/webrtc/SurfaceTextureHelper.java' , 153 'app/webrtc/java/android/org/webrtc/SurfaceTextureHelper.java' ,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 # from Android. 213 # from Android.
213 # TODO(perkj): Consider replacing the use of 214 # TODO(perkj): Consider replacing the use of
214 # libjingle_peerconnection_jar with this target everywhere. 215 # libjingle_peerconnection_jar with this target everywhere.
215 'target_name': 'libjingle_peerconnection_java', 216 'target_name': 'libjingle_peerconnection_java',
216 'type': 'none', 217 'type': 'none',
217 'dependencies': [ 218 'dependencies': [
218 'libjingle_peerconnection_so', 219 'libjingle_peerconnection_so',
219 ], 220 ],
220 'variables': { 221 'variables': {
221 'java_in_dir': 'app/webrtc/java', 222 'java_in_dir': 'app/webrtc/java',
223 'webrtc_base_dir': '<(webrtc_root)/base',
222 'webrtc_modules_dir': '<(webrtc_root)/modules', 224 'webrtc_modules_dir': '<(webrtc_root)/modules',
223 'additional_src_dirs' : [ 225 'additional_src_dirs' : [
224 'app/webrtc/java/android', 226 'app/webrtc/java/android',
227 '<(webrtc_base_dir)/java/src',
225 '<(webrtc_modules_dir)/audio_device/android/java/src', 228 '<(webrtc_modules_dir)/audio_device/android/java/src',
226 '<(webrtc_modules_dir)/video_capture/android/java/src', 229 '<(webrtc_modules_dir)/video_capture/android/java/src',
227 '<(webrtc_modules_dir)/video_render/android/java/src', 230 '<(webrtc_modules_dir)/video_render/android/java/src',
228 ], 231 ],
229 }, 232 },
230 'includes': ['../build/java.gypi'], 233 'includes': ['../build/java.gypi'],
231 }, # libjingle_peerconnection_java 234 }, # libjingle_peerconnection_java
232 ] 235 ]
233 }], 236 }],
234 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', { 237 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', {
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 ['OS=="android" and build_with_chromium==0', { 782 ['OS=="android" and build_with_chromium==0', {
780 'sources': [ 783 'sources': [
781 'app/webrtc/androidvideocapturer.h', 784 'app/webrtc/androidvideocapturer.h',
782 'app/webrtc/androidvideocapturer.cc', 785 'app/webrtc/androidvideocapturer.cc',
783 ], 786 ],
784 }], 787 }],
785 ], 788 ],
786 }, # target libjingle_peerconnection 789 }, # target libjingle_peerconnection
787 ], 790 ],
788 } 791 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698