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

Side by Side Diff: webrtc/api/api.gyp

Issue 1702603002: AndroidVideoCapturer getSupportedFormats(): Change interface from JSON string to List/vector (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove logging from C++. Remove json from api.gyp. Created 4 years, 10 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 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 ], 67 ],
68 'cflags_cc!': [ 68 'cflags_cc!': [
69 '-Wnon-virtual-dtor', 69 '-Wnon-virtual-dtor',
70 '-Woverloaded-virtual', 70 '-Woverloaded-virtual',
71 ], 71 ],
72 'msvs_disabled_warnings': [ 72 'msvs_disabled_warnings': [
73 4245, # conversion from 'int' to 'size_t', signed/unsigned mismatch . 73 4245, # conversion from 'int' to 'size_t', signed/unsigned mismatch .
74 4267, # conversion from 'size_t' to 'int', possible loss of data. 74 4267, # conversion from 'size_t' to 'int', possible loss of data.
75 4389, # signed/unsigned mismatch. 75 4389, # signed/unsigned mismatch.
76 ], 76 ],
77 'conditions': [
78 ['build_json==1', {
79 'dependencies': [
80 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
81 ],
82 'export_dependent_settings': [
83 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
84 ],
85 }],
86 ],
87 }, 77 },
88 { 78 {
89 'target_name': 'libjingle_peerconnection_so', 79 'target_name': 'libjingle_peerconnection_so',
90 'type': 'shared_library', 80 'type': 'shared_library',
91 'dependencies': [ 81 'dependencies': [
92 'libjingle_peerconnection', 82 'libjingle_peerconnection',
93 'libjingle_peerconnection_jni', 83 'libjingle_peerconnection_jni',
94 ], 84 ],
95 'sources': [ 85 'sources': [
96 'java/jni/jni_onload.cc', 86 'java/jni/jni_onload.cc',
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 'AdditionalOptions': [ 353 'AdditionalOptions': [
364 '-Wno-sign-compare', 354 '-Wno-sign-compare',
365 ], 355 ],
366 }, 356 },
367 }, 357 },
368 }], 358 }],
369 ], 359 ],
370 }, # target libjingle_peerconnection 360 }, # target libjingle_peerconnection
371 ], # targets 361 ], # targets
372 } 362 }
OLDNEW
« no previous file with comments | « webrtc/api/androidvideocapturer.cc ('k') | webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698