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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/api/api.gyp
diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
index 061d9c15544b4e1c7c6608e64417ca57fbad4e2f..c9add179feaa5384f6f52f8e4df3aa5d07fd627f 100644
--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@@ -74,16 +74,6 @@
4267, # conversion from 'size_t' to 'int', possible loss of data.
4389, # signed/unsigned mismatch.
],
- 'conditions': [
- ['build_json==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
- ],
- 'export_dependent_settings': [
- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
- ],
- }],
- ],
},
{
'target_name': 'libjingle_peerconnection_so',
« 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