From d54f5f5c763cc35514ff51fa6621aadec043fe47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Fri, 3 Aug 2018 13:23:05 +0200 Subject: [PATCH] Rename rtc_instrumentation_test_apk targets to end with _test_apk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#24184} --- BUILD.gn | 2 +- examples/BUILD.gn | 8 ++++---- examples/androidtests/README | 4 ++-- examples/androidtests/video_quality_loopback_test.py | 2 +- sdk/android/BUILD.gn | 4 ++-- tools_webrtc/mb/gn_isolate_map.pyl | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 3f07fdb1a5..b216cb8b7e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -67,7 +67,7 @@ if (!build_with_chromium) { if (is_android) { deps += [ ":android_junit_tests", - "sdk/android:libjingle_peerconnection_android_unittest", + "sdk/android:android_instrumentation_test_apk", ] } else { deps += [ "modules/video_capture:video_capture_tests" ] diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 11752919a9..7bc75af3b0 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -25,8 +25,8 @@ group("examples") { if (is_android) { deps += [ ":AppRTCMobile", - ":AppRTCMobileTest", - ":AppRTCMobileTestStubbedVideoIO", + ":AppRTCMobile_stubbed_video_io_test_apk", + ":AppRTCMobile_test_apk", ":libwebrtc_unity", ] @@ -136,7 +136,7 @@ if (is_android) { custom_package = "org.appspot.apprtc" } - rtc_instrumentation_test_apk("AppRTCMobileTest") { + rtc_instrumentation_test_apk("AppRTCMobile_test_apk") { apk_name = "AppRTCMobileTest" 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" android_manifest = "androidtests/AndroidManifest.xml" diff --git a/examples/androidtests/README b/examples/androidtests/README index 49ae6c81d6..0701b0e896 100644 --- a/examples/androidtests/README +++ b/examples/androidtests/README @@ -4,11 +4,11 @@ Example of building & using the app: - Build Android AppRTCMobile and AppRTCMobile unit test: cd /src -ninja -C out/Debug AppRTCMobileTest +ninja -C out/Debug AppRTCMobile_test_apk - Install AppRTCMobile and AppRTCMobileTest: adb install -r out/Debug/apks/AppRTCMobile.apk adb install -r out/Debug/apks/AppRTCMobileTest.apk - Run unit tests: -adb shell am instrument -w org.appspot.apprtc.test/android.test.InstrumentationTestRunner \ No newline at end of file +adb shell am instrument -w org.appspot.apprtc.test/android.test.InstrumentationTestRunner diff --git a/examples/androidtests/video_quality_loopback_test.py b/examples/androidtests/video_quality_loopback_test.py index d5eb1e50d4..225f885273 100755 --- a/examples/androidtests/video_quality_loopback_test.py +++ b/examples/androidtests/video_quality_loopback_test.py @@ -170,7 +170,7 @@ def RunTest(android_device, adb_path, build_dir, temp_dir, num_retries, # Start loopback call and record video. 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, '--num-retries', num_retries]) diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index b69edfbf63..1119cd0919 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -1245,8 +1245,8 @@ if (is_android) { ################ if (rtc_include_tests) { - rtc_instrumentation_test_apk("libjingle_peerconnection_android_unittest") { - apk_name = "libjingle_peerconnection_android_unittest" + rtc_instrumentation_test_apk("android_instrumentation_test_apk") { + apk_name = "android_instrumentation_test_apk" android_manifest = "instrumentationtests/AndroidManifest.xml" java_files = [ diff --git a/tools_webrtc/mb/gn_isolate_map.pyl b/tools_webrtc/mb/gn_isolate_map.pyl index 848a9b38e4..57ede1aaed 100644 --- a/tools_webrtc/mb/gn_isolate_map.pyl +++ b/tools_webrtc/mb/gn_isolate_map.pyl @@ -19,12 +19,12 @@ "label": "//:All", "type": "additional_compile_target", }, - "AppRTCMobileTest": { - "label": "//examples:AppRTCMobileTest", + "AppRTCMobile_test_apk": { + "label": "//examples:AppRTCMobile_test_apk", "type": "additional_compile_target", }, - "AppRTCMobileTestStubbedVideoIO": { - "label": "//examples:AppRTCMobileTestStubbedVideoIO", + "AppRTCMobile_stubbed_video_io_test_apk": { + "label": "//examples:AppRTCMobile_stubbed_video_io_test_apk", "type": "additional_compile_target", }, "android_junit_tests": { @@ -55,8 +55,8 @@ "isac_speech_and_misc_wb.pcm", ] }, - "libjingle_peerconnection_android_unittest": { - "label": "//sdk/android:libjingle_peerconnection_android_unittest", + "android_instrumentation_test_apk": { + "label": "//sdk/android:android_instrumentation_test_apk", "type": "additional_compile_target", }, "low_bandwidth_audio_test": {