admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix android_junit_tests and add a GN target for them.

Browse Source 
BUG=webrtc:6365
NOTRY=True

Review-Url: https://codereview.webrtc.org/2346793002
Cr-Commit-Position: refs/heads/master@{#14241}
This commit is contained in:
sakal 2016-09-15 12:27:52 -07:00 committed by Commit bot
parent 530b3f5d06
commit bb716daea7
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/BUILD.gn
View File

@ -12,6 +12,10 @@ import("//build/config/linux/pkg_config.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("build/webrtc.gni")
import("//third_party/protobuf/proto_library.gni")
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
}
# Contains the defines and includes in common.gypi that are duplicated both as
# target_defaults and direct_dependent_settings.
@ -828,3 +832,14 @@ if (rtc_include_tests) {
}
}
}
if (is_android) {
junit_binary("android_junit_tests") {
java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ]
deps = [
"//webrtc/api:libjingle_peerconnection_java",
"//webrtc/api:libjingle_peerconnection_jni",
]
}
}

4
webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
View File

@ -15,9 +15,9 @@ import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRa
import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange;
import org.chromium.testing.local.LocalRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import java.util.Arrays;
@ -25,7 +25,7 @@ import java.util.Arrays;
/**
* Tests for CameraEnumerationAndroid.
*/
@RunWith(RobolectricTestRunner.class)
@RunWith(LocalRobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class CameraEnumerationTest {
@Test