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

Rename APK tests workaround to make it more generic.

Browse Source 
We plan to add junit tests running with Robolectric
so naming these files "apk" is slightly confusing.

NOTRY=True

Review-Url: https://codereview.webrtc.org/2020213002
Cr-Commit-Position: refs/heads/master@{#12971}
This commit is contained in:
kjellander 2016-05-31 04:01:38 -07:00 committed by Commit bot
parent e9cc6b9f19
commit 208d19845d
13 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/api/OWNERS
View File

@ -4,3 +4,8 @@ juberti@webrtc.org
perkj@webrtc.org
tkchin@webrtc.org
tommi@webrtc.org
# These are for the common case of adding or renaming files. If you're doing
# structural changes, please get a review from a reviewer in this file.
per-file *.gyp=*
per-file *.gypi=*

4
webrtc/api/api_tests.gyp
View File

@ -159,7 +159,7 @@
'target_name': 'peerconnection_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):peerconnection_unittests_apk',
'<(android_tests_path):peerconnection_unittests_apk',
],
},
],
@ -171,7 +171,7 @@
'target_name': 'peerconnection_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):peerconnection_unittests_apk',
'<(android_tests_path):peerconnection_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

4
webrtc/build/apk_tests.gyp → webrtc/build/android_tests.gyp
View File

@ -7,8 +7,8 @@
# be found in the AUTHORS file in the root of the source tree.
# This file exists in two versions. A no-op version under
# webrtc/build/apk_tests_noop.gyp and this one. This gyp file builds the apk
# unit tests (for Android) assuming that WebRTC is built inside a Chromium
# webrtc/build/android_tests_noop.gyp and this one. This gyp file builds the
# tests (for Android) assuming that WebRTC is built inside a Chromium
# workspace. The no-op version is included when building WebRTC without
# Chromium. This is a workaround for the fact that 'includes' don't expand
# variables and that the relative location of apk_test.gypi is different for

2
webrtc/build/apk_tests_noop.gyp → webrtc/build/android_tests_noop.gyp
View File

@ -6,7 +6,7 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
# See webrtc/build/apk_tests.gyp for more information about this file.
# See webrtc/build/android_tests.gyp for more information about this file.
{
'targets': [
{

8
webrtc/build/common.gypi
View File

@ -34,11 +34,11 @@
['build_with_chromium==1', {
'webrtc_root%': '<(DEPTH)/third_party/webrtc',
'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop.gyp',
'android_tests_path%': '<(DEPTH)/third_party/webrtc/build/android_tests_noop.gyp',
'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modules_java_chromium.gyp',
}, {
'webrtc_root%': '<(DEPTH)/webrtc',
'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_tests.gyp',
'android_tests_path%': '<(DEPTH)/webrtc/build/android_tests.gyp',
'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp',
}],
@ -59,7 +59,7 @@
'build_libevent%': '<(build_libevent)',
'enable_libevent%': '<(enable_libevent)',
'webrtc_root%': '<(webrtc_root)',
'apk_tests_path%': '<(apk_tests_path)',
'android_tests_path%': '<(android_tests_path)',
'modules_java_gyp_path%': '<(modules_java_gyp_path)',
'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9',
@ -72,7 +72,7 @@
'build_libevent%': '<(build_libevent)',
'enable_libevent%': '<(enable_libevent)',
'webrtc_root%': '<(webrtc_root)',
'apk_tests_path%': '<(apk_tests_path)',
'android_tests_path%': '<(android_tests_path)',
'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py',
'modules_java_gyp_path%': '<(modules_java_gyp_path)',
'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',

4
webrtc/common_audio/common_audio.gyp
View File

@ -290,7 +290,7 @@
'target_name': 'common_audio_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):common_audio_unittests_apk',
'<(android_tests_path):common_audio_unittests_apk',
],
},
],
@ -302,7 +302,7 @@
'target_name': 'common_audio_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):common_audio_unittests_apk',
'<(android_tests_path):common_audio_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

4
webrtc/common_video/common_video_unittests.gyp
View File

@ -51,7 +51,7 @@
'target_name': 'common_video_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):common_video_unittests_apk',
'<(android_tests_path):common_video_unittests_apk',
],
},
],
@ -63,7 +63,7 @@
'target_name': 'common_video_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):common_video_unittests_apk',
'<(android_tests_path):common_video_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

16
webrtc/modules/modules.gyp
View File

@ -621,28 +621,28 @@
'target_name': 'audio_codec_speed_tests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):audio_codec_speed_tests_apk',
'<(android_tests_path):audio_codec_speed_tests_apk',
],
},
{
'target_name': 'audio_decoder_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):audio_decoder_unittests_apk',
'<(android_tests_path):audio_decoder_unittests_apk',
],
},
{
'target_name': 'modules_tests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):modules_tests_apk',
'<(android_tests_path):modules_tests_apk',
],
},
{
'target_name': 'modules_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):modules_unittests_apk',
'<(android_tests_path):modules_unittests_apk',
],
},
],
@ -654,7 +654,7 @@
'target_name': 'audio_codec_speed_tests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):audio_codec_speed_tests_apk',
'<(android_tests_path):audio_codec_speed_tests_apk',
],
'includes': [
'../build/isolate.gypi',
@ -667,7 +667,7 @@
'target_name': 'audio_decoder_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):audio_decoder_unittests_apk',
'<(android_tests_path):audio_decoder_unittests_apk',
],
'includes': [
'../build/isolate.gypi',
@ -680,7 +680,7 @@
'target_name': 'modules_tests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):modules_tests_apk',
'<(android_tests_path):modules_tests_apk',
],
'includes': [
'../build/isolate.gypi',
@ -693,7 +693,7 @@
'target_name': 'modules_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):modules_unittests_apk',
'<(android_tests_path):modules_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

4
webrtc/system_wrappers/system_wrappers_tests.gyp
View File

@ -63,7 +63,7 @@
'target_name': 'system_wrappers_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):system_wrappers_unittests_apk',
'<(android_tests_path):system_wrappers_unittests_apk',
],
},
],
@ -75,7 +75,7 @@
'target_name': 'system_wrappers_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):system_wrappers_unittests_apk',
'<(android_tests_path):system_wrappers_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

4
webrtc/test/test.gyp
View File

@ -394,7 +394,7 @@
'target_name': 'test_support_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):test_support_unittests_apk',
'<(android_tests_path):test_support_unittests_apk',
],
},
],
@ -406,7 +406,7 @@
'target_name': 'test_support_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):test_support_unittests_apk',
'<(android_tests_path):test_support_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

4
webrtc/tools/tools.gyp
View File

@ -185,7 +185,7 @@
'target_name': 'tools_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):tools_unittests_apk',
'<(android_tests_path):tools_unittests_apk',
],
},
],
@ -197,7 +197,7 @@
'target_name': 'tools_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):tools_unittests_apk',
'<(android_tests_path):tools_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

4
webrtc/voice_engine/voice_engine.gyp
View File

@ -251,7 +251,7 @@
'target_name': 'voice_engine_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):voice_engine_unittests_apk',
'<(android_tests_path):voice_engine_unittests_apk',
],
},
],
@ -263,7 +263,7 @@
'target_name': 'voice_engine_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):voice_engine_unittests_apk',
'<(android_tests_path):voice_engine_unittests_apk',
],
'includes': [
'../build/isolate.gypi',

16
webrtc/webrtc_tests.gypi
View File

@ -329,28 +329,28 @@
'target_name': 'rtc_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):rtc_unittests_apk',
'<(android_tests_path):rtc_unittests_apk',
],
},
{
'target_name': 'video_engine_tests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):video_engine_tests_apk',
'<(android_tests_path):video_engine_tests_apk',
],
},
{
'target_name': 'webrtc_perf_tests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):webrtc_perf_tests_apk',
'<(android_tests_path):webrtc_perf_tests_apk',
],
},
{
'target_name': 'webrtc_nonparallel_tests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):webrtc_nonparallel_tests_apk',
'<(android_tests_path):webrtc_nonparallel_tests_apk',
],
},
],
@ -362,7 +362,7 @@
'target_name': 'rtc_unittests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):rtc_unittests_apk',
'<(android_tests_path):rtc_unittests_apk',
],
'includes': [
'build/isolate.gypi',
@ -375,7 +375,7 @@
'target_name': 'video_engine_tests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):video_engine_tests_apk',
'<(android_tests_path):video_engine_tests_apk',
],
'includes': [
'build/isolate.gypi',
@ -388,7 +388,7 @@
'target_name': 'webrtc_perf_tests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):webrtc_perf_tests_apk',
'<(android_tests_path):webrtc_perf_tests_apk',
],
'includes': [
'build/isolate.gypi',
@ -401,7 +401,7 @@
'target_name': 'webrtc_nonparallel_tests_apk_run',
'type': 'none',
'dependencies': [
'<(apk_tests_path):webrtc_nonparallel_tests_apk',
'<(android_tests_path):webrtc_nonparallel_tests_apk',
],
'includes': [
'build/isolate.gypi',