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

Side by Side Diff: talk/libjingle.gyp

Issue 1553033002: Roll chromium_revision d66326c..4df108a (367167:367307) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Updated to 4df108a08782de0f5275a52491eedcaacfe1907f (367307) Created 4 years, 11 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 'app/webrtc/java/jni/jni_helpers.cc', 55 'app/webrtc/java/jni/jni_helpers.cc',
56 'app/webrtc/java/jni/jni_helpers.h', 56 'app/webrtc/java/jni/jni_helpers.h',
57 'app/webrtc/java/jni/native_handle_impl.cc', 57 'app/webrtc/java/jni/native_handle_impl.cc',
58 'app/webrtc/java/jni/native_handle_impl.h', 58 'app/webrtc/java/jni/native_handle_impl.h',
59 'app/webrtc/java/jni/peerconnection_jni.cc', 59 'app/webrtc/java/jni/peerconnection_jni.cc',
60 ], 60 ],
61 'include_dirs': [ 61 'include_dirs': [
62 '<(libyuv_dir)/include', 62 '<(libyuv_dir)/include',
63 ], 63 ],
64 'conditions': [ 64 'conditions': [
65 ['clang==1', {
66 'cflags': ['-Wno-overloaded-virtual'],
67 }],
65 ['OS=="linux"', { 68 ['OS=="linux"', {
66 'defines': [ 69 'defines': [
67 'HAVE_GTK', 70 'HAVE_GTK',
68 ], 71 ],
69 'include_dirs': [ 72 'include_dirs': [
70 '<(java_home)/include', 73 '<(java_home)/include',
71 '<(java_home)/include/linux', 74 '<(java_home)/include/linux',
72 ], 75 ],
73 'conditions': [ 76 'conditions': [
74 ['use_gtk==1', { 77 ['use_gtk==1', {
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 'all_dependent_settings': { 353 'all_dependent_settings': {
351 'xcode_settings': { 354 'xcode_settings': {
352 'CLANG_ENABLE_OBJC_ARC': 'YES', 355 'CLANG_ENABLE_OBJC_ARC': 'YES',
353 }, 356 },
354 }, 357 },
355 'xcode_settings': { 358 'xcode_settings': {
356 'CLANG_ENABLE_OBJC_ARC': 'YES', 359 'CLANG_ENABLE_OBJC_ARC': 'YES',
357 # common.gypi enables this for mac but we want this to be disabled 360 # common.gypi enables this for mac but we want this to be disabled
358 # like it is for ios. 361 # like it is for ios.
359 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO', 362 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO',
363 # Ref..
kjellander_webrtc 2016/01/04 15:17:03 Will add bug link once the issue tracker is back u
364 'WARNING_CFLAGS': ['-Wno-unused-property-ivar'],
360 }, 365 },
361 'conditions': [ 366 'conditions': [
362 ['OS=="ios"', { 367 ['OS=="ios"', {
363 'sources': [ 368 'sources': [
364 'app/webrtc/objc/avfoundationvideocapturer.h', 369 'app/webrtc/objc/avfoundationvideocapturer.h',
365 'app/webrtc/objc/avfoundationvideocapturer.mm', 370 'app/webrtc/objc/avfoundationvideocapturer.mm',
366 'app/webrtc/objc/RTCAVFoundationVideoSource+Internal.h', 371 'app/webrtc/objc/RTCAVFoundationVideoSource+Internal.h',
367 'app/webrtc/objc/RTCAVFoundationVideoSource.mm', 372 'app/webrtc/objc/RTCAVFoundationVideoSource.mm',
368 'app/webrtc/objc/RTCEAGLVideoView.m', 373 'app/webrtc/objc/RTCEAGLVideoView.m',
369 'app/webrtc/objc/public/RTCEAGLVideoView.h', 374 'app/webrtc/objc/public/RTCEAGLVideoView.h',
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 ['OS=="android" and build_with_chromium==0', { 801 ['OS=="android" and build_with_chromium==0', {
797 'sources': [ 802 'sources': [
798 'app/webrtc/androidvideocapturer.h', 803 'app/webrtc/androidvideocapturer.h',
799 'app/webrtc/androidvideocapturer.cc', 804 'app/webrtc/androidvideocapturer.cc',
800 ], 805 ],
801 }], 806 }],
802 ], 807 ],
803 }, # target libjingle_peerconnection 808 }, # target libjingle_peerconnection
804 ], 809 ],
805 } 810 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698