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

Rename rtc_instrumentation_test_apk targets to end with _test_apk.

Browse Source 
This matches Chromium pattern of naming instrumentation test apks with
a name ending in _test_apk. The old naming confuses generate_gradle.py.

Renames:
 - AppRTCMobileTest
   -> AppRTCMobile_test_apk
 - AppRTCMobileTestStubbedVideoIO
   -> AppRTCMobile_stubbed_video_io_test_apk
 - libjingle_peerconnection_android_unittest
   -> android_instrumentation_test_apk

Bug: webrtc:9588
TBR: phoglund
Change-Id: Idb82dc4bd089bc7c90e9373f7c3d572f9fd2d95a
Reviewed-on: https://webrtc-review.googlesource.com/92380
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24184}
This commit is contained in:
Sami Kalliomäki
2018-08-03 13:23:05 +02:00
committed by Commit Bot
parent 0cbe05cc86
commit d54f5f5c76
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -67,7 +67,7 @@ if (!build_with_chromium) {
if (is_android) { if (is_android) {
deps += [ deps += [
":android_junit_tests", ":android_junit_tests",
"sdk/android:libjingle_peerconnection_android_unittest", "sdk/android:android_instrumentation_test_apk",
] ]
} else { } else {
deps += [ "modules/video_capture:video_capture_tests" ] deps += [ "modules/video_capture:video_capture_tests" ]

8
examples/BUILD.gn
View File

@ -25,8 +25,8 @@ group("examples") {
if (is_android) { if (is_android) {
deps += [ deps += [
":AppRTCMobile", ":AppRTCMobile",
":AppRTCMobileTest", ":AppRTCMobile_stubbed_video_io_test_apk",
":AppRTCMobileTestStubbedVideoIO", ":AppRTCMobile_test_apk",
":libwebrtc_unity", ":libwebrtc_unity",
] ]
@ -136,7 +136,7 @@ if (is_android) {
custom_package = "org.appspot.apprtc" custom_package = "org.appspot.apprtc"
} }
rtc_instrumentation_test_apk("AppRTCMobileTest") { rtc_instrumentation_test_apk("AppRTCMobile_test_apk") {
apk_name = "AppRTCMobileTest" apk_name = "AppRTCMobileTest"
android_manifest = "androidtests/AndroidManifest.xml" android_manifest = "androidtests/AndroidManifest.xml"
@ -155,7 +155,7 @@ if (is_android) {
] ]
} }
rtc_instrumentation_test_apk("AppRTCMobileTestStubbedVideoIO") { rtc_instrumentation_test_apk("AppRTCMobile_stubbed_video_io_test_apk") {
apk_name = "AppRTCMobileTestStubbedVideoIO" apk_name = "AppRTCMobileTestStubbedVideoIO"
android_manifest = "androidtests/AndroidManifest.xml" android_manifest = "androidtests/AndroidManifest.xml"

4
examples/androidtests/README
View File

@ -4,11 +4,11 @@ Example of building & using the app:
- Build Android AppRTCMobile and AppRTCMobile unit test: - Build Android AppRTCMobile and AppRTCMobile unit test:
cd <path/to/webrtc>/src cd <path/to/webrtc>/src
ninja -C out/Debug AppRTCMobileTest ninja -C out/Debug AppRTCMobile_test_apk
- Install AppRTCMobile and AppRTCMobileTest: - Install AppRTCMobile and AppRTCMobileTest:
adb install -r out/Debug/apks/AppRTCMobile.apk adb install -r out/Debug/apks/AppRTCMobile.apk
adb install -r out/Debug/apks/AppRTCMobileTest.apk adb install -r out/Debug/apks/AppRTCMobileTest.apk
- Run unit tests: - Run unit tests:
adb shell am instrument -w org.appspot.apprtc.test/android.test.InstrumentationTestRunner adb shell am instrument -w org.appspot.apprtc.test/android.test.InstrumentationTestRunner

2
examples/androidtests/video_quality_loopback_test.py
View File

@ -170,7 +170,7 @@ def RunTest(android_device, adb_path, build_dir, temp_dir, num_retries,
# Start loopback call and record video. # Start loopback call and record video.
test_script = os.path.join( test_script = os.path.join(
build_dir, 'bin', 'run_AppRTCMobileTestStubbedVideoIO') build_dir, 'bin', 'run_AppRTCMobile_stubbed_video_io_test_apk')
_RunCommand([test_script, '--device', android_device, _RunCommand([test_script, '--device', android_device,
'--num-retries', num_retries]) '--num-retries', num_retries])

4
sdk/android/BUILD.gn
View File

@ -1245,8 +1245,8 @@ if (is_android) {
################ ################
if (rtc_include_tests) { if (rtc_include_tests) {
rtc_instrumentation_test_apk("libjingle_peerconnection_android_unittest") { rtc_instrumentation_test_apk("android_instrumentation_test_apk") {
apk_name = "libjingle_peerconnection_android_unittest" apk_name = "android_instrumentation_test_apk"
android_manifest = "instrumentationtests/AndroidManifest.xml" android_manifest = "instrumentationtests/AndroidManifest.xml"
java_files = [ java_files = [

12
tools_webrtc/mb/gn_isolate_map.pyl
View File

@ -19,12 +19,12 @@
"label": "//:All", "label": "//:All",
"type": "additional_compile_target", "type": "additional_compile_target",
}, },
"AppRTCMobileTest": { "AppRTCMobile_test_apk": {
"label": "//examples:AppRTCMobileTest", "label": "//examples:AppRTCMobile_test_apk",
"type": "additional_compile_target", "type": "additional_compile_target",
}, },
"AppRTCMobileTestStubbedVideoIO": { "AppRTCMobile_stubbed_video_io_test_apk": {
"label": "//examples:AppRTCMobileTestStubbedVideoIO", "label": "//examples:AppRTCMobile_stubbed_video_io_test_apk",
"type": "additional_compile_target", "type": "additional_compile_target",
}, },
"android_junit_tests": { "android_junit_tests": {
@ -55,8 +55,8 @@
"isac_speech_and_misc_wb.pcm", "isac_speech_and_misc_wb.pcm",
] ]
}, },
"libjingle_peerconnection_android_unittest": { "android_instrumentation_test_apk": {
"label": "//sdk/android:libjingle_peerconnection_android_unittest", "label": "//sdk/android:android_instrumentation_test_apk",
"type": "additional_compile_target", "type": "additional_compile_target",
}, },
"low_bandwidth_audio_test": { "low_bandwidth_audio_test": {