| OLD | NEW |
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 } | 50 } |
| 51 if (is_posix) { | 51 if (is_posix) { |
| 52 defines += [ "WEBRTC_POSIX" ] | 52 defines += [ "WEBRTC_POSIX" ] |
| 53 } | 53 } |
| 54 if (is_ios) { | 54 if (is_ios) { |
| 55 defines += [ | 55 defines += [ |
| 56 "WEBRTC_MAC", | 56 "WEBRTC_MAC", |
| 57 "WEBRTC_IOS", | 57 "WEBRTC_IOS", |
| 58 ] | 58 ] |
| 59 } | 59 } |
| 60 if (is_ios && rtc_use_objc_h264) { | |
| 61 defines += [ "WEBRTC_OBJC_H264" ] | |
| 62 } | |
| 63 if (is_linux) { | 60 if (is_linux) { |
| 64 defines += [ "WEBRTC_LINUX" ] | 61 defines += [ "WEBRTC_LINUX" ] |
| 65 } | 62 } |
| 66 if (is_mac) { | 63 if (is_mac) { |
| 67 defines += [ "WEBRTC_MAC" ] | 64 defines += [ "WEBRTC_MAC" ] |
| 68 } | 65 } |
| 69 if (is_win) { | 66 if (is_win) { |
| 70 defines += [ | 67 defines += [ |
| 71 "WEBRTC_WIN", | 68 "WEBRTC_WIN", |
| 72 "_CRT_SECURE_NO_WARNINGS", # Suppress warnings about _vsnprinf | 69 "_CRT_SECURE_NO_WARNINGS", # Suppress warnings about _vsnprinf |
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 845 ] | 842 ] |
| 846 | 843 |
| 847 deps = [ | 844 deps = [ |
| 848 "//webrtc/api:libjingle_peerconnection_java", | 845 "//webrtc/api:libjingle_peerconnection_java", |
| 849 "//webrtc/api:libjingle_peerconnection_jni", | 846 "//webrtc/api:libjingle_peerconnection_jni", |
| 850 "//webrtc/examples:AppRTCDemo_javalib", | 847 "//webrtc/examples:AppRTCDemo_javalib", |
| 851 ] | 848 ] |
| 852 } | 849 } |
| 853 } | 850 } |
| 854 } | 851 } |
| OLD | NEW |