zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Fix android_junit_tests and add a GN target for them. (patchset #1 id:20001 of https://codereview.webrtc.org/2346793002/ )

Browse Source 
Reason for revert:
Breaks WebRTC in Chrome on Android:

https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Android%20Builder%20(dbg)

Original issue's description:
> Fix android_junit_tests and add a GN target for them.
>
> BUG=webrtc:6365
> NOTRY=True
>
> Committed: https://crrev.com/bb716daea73889517f996aa29f867563ed63d58a
> Cr-Commit-Position: refs/heads/master@{#14241}

TBR=magjed@webrtc.org,kjellander@webrtc.org,sakal@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6365

Review-Url: https://codereview.webrtc.org/2341213003
Cr-Commit-Position: refs/heads/master@{#14253}
This commit is contained in:
henrika
2016-09-16 04:11:51 -07:00
committed by Commit bot
parent f72321aafe
commit 9adb1ff943
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/BUILD.gn
View File

@ -12,10 +12,6 @@ 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.
@ -832,14 +828,3 @@ 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(LocalRobolectricTestRunner.class)
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class CameraEnumerationTest {
@Test