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

Side by Side Diff: talk/libjingle.gyp

Issue 1347083003: Remove the video capture module on Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed Android Java files 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
« no previous file with comments | « no previous file | webrtc/build/apk_tests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 'libjingle_peerconnection_so', 219 'libjingle_peerconnection_so',
220 ], 220 ],
221 'variables': { 221 'variables': {
222 'java_in_dir': 'app/webrtc/java', 222 'java_in_dir': 'app/webrtc/java',
223 'webrtc_base_dir': '<(webrtc_root)/base', 223 'webrtc_base_dir': '<(webrtc_root)/base',
224 'webrtc_modules_dir': '<(webrtc_root)/modules', 224 'webrtc_modules_dir': '<(webrtc_root)/modules',
225 'additional_src_dirs' : [ 225 'additional_src_dirs' : [
226 'app/webrtc/java/android', 226 'app/webrtc/java/android',
227 '<(webrtc_base_dir)/java/src', 227 '<(webrtc_base_dir)/java/src',
228 '<(webrtc_modules_dir)/audio_device/android/java/src', 228 '<(webrtc_modules_dir)/audio_device/android/java/src',
229 '<(webrtc_modules_dir)/video_capture/android/java/src',
230 '<(webrtc_modules_dir)/video_render/android/java/src', 229 '<(webrtc_modules_dir)/video_render/android/java/src',
231 ], 230 ],
232 }, 231 },
233 'includes': ['../build/java.gypi'], 232 'includes': ['../build/java.gypi'],
234 }, # libjingle_peerconnection_java 233 }, # libjingle_peerconnection_java
235 ] 234 ]
236 }], 235 }],
237 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', { 236 ['OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.7")', {
238 # The >= 10.7 above is required for ARC. 237 # The >= 10.7 above is required for ARC.
239 'targets': [ 238 'targets': [
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 ['OS=="android" and build_with_chromium==0', { 781 ['OS=="android" and build_with_chromium==0', {
783 'sources': [ 782 'sources': [
784 'app/webrtc/androidvideocapturer.h', 783 'app/webrtc/androidvideocapturer.h',
785 'app/webrtc/androidvideocapturer.cc', 784 'app/webrtc/androidvideocapturer.cc',
786 ], 785 ],
787 }], 786 }],
788 ], 787 ],
789 }, # target libjingle_peerconnection 788 }, # target libjingle_peerconnection
790 ], 789 ],
791 } 790 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/build/apk_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698