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 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
820 | 820 |
821 if (is_mac) { | 821 if (is_mac) { |
822 sources += [ "base/macsocketserver_unittest.cc" ] | 822 sources += [ "base/macsocketserver_unittest.cc" ] |
823 } | 823 } |
824 if (is_clang) { | 824 if (is_clang) { |
825 # Suppress warnings from the Chromium Clang plugin. | 825 # Suppress warnings from the Chromium Clang plugin. |
826 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 826 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
827 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 827 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
828 } | 828 } |
829 } | 829 } |
| 830 |
| 831 if (is_android) { |
| 832 junit_binary("android_junit_tests") { |
| 833 java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ] |
| 834 |
| 835 deps = [ |
| 836 "//webrtc/api:libjingle_peerconnection_java", |
| 837 "//webrtc/api:libjingle_peerconnection_jni", |
| 838 ] |
| 839 } |
| 840 } |
830 } | 841 } |
OLD | NEW |