| 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 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 } | 827 } |
| 828 if (is_clang) { | 828 if (is_clang) { |
| 829 # Suppress warnings from the Chromium Clang plugin. | 829 # Suppress warnings from the Chromium Clang plugin. |
| 830 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 830 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 831 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 831 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 832 } | 832 } |
| 833 } | 833 } |
| 834 | 834 |
| 835 if (is_android) { | 835 if (is_android) { |
| 836 junit_binary("android_junit_tests") { | 836 junit_binary("android_junit_tests") { |
| 837 java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ] | 837 java_files = [ |
| 838 "androidjunit/src/org/webrtc/CameraEnumerationTest.java", |
| 839 "examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java", |
| 840 "examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java"
, |
| 841 ] |
| 838 | 842 |
| 839 deps = [ | 843 deps = [ |
| 840 "//webrtc/api:libjingle_peerconnection_java", | 844 "//webrtc/api:libjingle_peerconnection_java", |
| 841 "//webrtc/api:libjingle_peerconnection_jni", | 845 "//webrtc/api:libjingle_peerconnection_jni", |
| 846 "//webrtc/examples:AppRTCDemo_javalib", |
| 842 ] | 847 ] |
| 843 } | 848 } |
| 844 } | 849 } |
| 845 } | 850 } |
| OLD | NEW |