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

GN: Synchronize resources between Android and iOS.

Browse Source 
iOS tests packaged into an .app uses the same way of
defining resources (the data attribute). Some iOS
simulator tests are failing due to missing resources, so
let's sync them all.

BUG=webrtc:5949
NOTRY=True

Review-Url: https://codereview.webrtc.org/2277753003
Cr-Commit-Position: refs/heads/master@{#13898}
This commit is contained in:
kjellander 2016-08-24 07:48:42 -07:00 committed by Commit bot
parent 2df32a31d2
commit 28a0ffdd52
7 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/BUILD.gn
View File

@ -700,11 +700,13 @@ if (rtc_include_tests) {
}
if (is_android) {
deps += [ "//testing/android/native_test:native_test_native_code" ]
shard_timeout = 900
}
if (is_android || is_ios) {
data = [
"//resources/foreman_cif_short.yuv",
"//resources/voice_engine/audio_long16.pcm",
]
shard_timeout = 900
}
}

7
webrtc/common_video/BUILD.gn
View File

@ -118,14 +118,13 @@ if (rtc_include_tests) {
if (is_android) {
deps += [ "//testing/android/native_test:native_test_support" ]
shard_timeout = 900
}
# This needs to be kept in sync with the .isolate file.
# TODO(kjellander); Move this to android_assets targets instead.
if (is_android || is_ios) {
data = [
"//resources/foreman_cif.yuv",
]
shard_timeout = 900
}
}
}

6
webrtc/media/BUILD.gn
View File

@ -340,9 +340,9 @@ if (rtc_include_tests) {
if (is_android) {
deps += [ "//testing/android/native_test:native_test_support" ]
# This needs to be kept in sync with the rtc_media_unittests.isolate file.
# TODO(kjellander); Move this to android_assets targets instead.
shard_timeout = 900
}
if (is_android || is_ios) {
data = [
"//resources/media/captured-320x240-2s-48.frames",
"//resources/media/faces.1280x720_P420.yuv",

7
webrtc/modules/BUILD.gn
View File

@ -506,9 +506,10 @@ if (rtc_include_tests) {
"audio_device/android/ensure_initialized.cc",
"audio_device/android/ensure_initialized.h",
]
shard_timeout = 900
}
# This needs to be kept in sync with the .isolate file.
# TODO(kjellander); Move this to android_assets targets instead.
if (is_android || is_ios) {
data = [
"//data/audio_processing/output_data_fixed.pb",
"//data/audio_processing/output_data_float.pb",
@ -611,8 +612,6 @@ if (rtc_include_tests) {
"//resources/verizon4g-downlink.rx",
"//resources/verizon4g-uplink.rx",
]
shard_timeout = 900
}
if (is_ios) {

6
webrtc/modules/audio_coding/BUILD.gn
View File

@ -1033,13 +1033,9 @@ if (rtc_include_tests) {
if (is_android) {
deps += [ "//testing/android/native_test:native_test_native_code" ]
shard_timeout = 900
data = [
"//resources/audio_coding/testfile32kHz.pcm",
]
}
if (is_ios) {
if (is_android || is_ios) {
data = [
"//resources/audio_coding/testfile32kHz.pcm",
]

8
webrtc/test/BUILD.gn
View File

@ -314,9 +314,10 @@ test("test_support_unittests") {
if (is_android) {
deps += [ "//testing/android/native_test:native_test_support" ]
shard_timeout = 900
}
# This needs to be kept in sync with the test_support_unittests.isolate file.
# TODO(kjellander); Move this to android_assets targets instead.
if (is_android || is_ios) {
data = [
"//resources/foreman_cif_short.yuv",
"//resources/video_coding/frame-ethernet-ii.pcap",
@ -326,9 +327,8 @@ test("test_support_unittests") {
"//resources/video_coding/ssrcs-2.pcap",
"//resources/video_coding/ssrcs-3.pcap",
]
shard_timeout = 900
}
deps += [
":channel_transport",
":test_common",

6
webrtc/tools/BUILD.gn
View File

@ -350,12 +350,12 @@ if (rtc_include_tests) {
if (is_android) {
deps += [ "//testing/android/native_test:native_test_support" ]
shard_timeout = 900
}
if (is_android || is_ios) {
data = [
"//resources/foreman_cif.yuv",
]
shard_timeout = 900
}
}