GN: Fix resource files for iOS test target

webrtc/modules/BUILD.gn

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../build/webrtc.gni")
 import("audio_coding/audio_coding.gni")
@@ skipping 15 matching lines @@
     "desktop_capture",
     "media_file",
     "rtp_rtcp",
     "utility",
     "video_coding",
     "video_processing",
   ]
 }
 
 if (rtc_include_tests) {
+  if (is_android || is_ios) {
+    modules_tests_resources = [
+      "//resources/audio_coding/testfile32kHz.pcm",
+      "//resources/audio_coding/teststereo32kHz.pcm",
+      "//resources/foreman_cif.yuv",
+      "//resources/paris_qcif.yuv",
+    ]
+  }
+
+  if (is_ios) {
+    bundle_data("modules_tests_bundle_data") {
+      testonly = true
+      sources = modules_tests_resources
+      outputs = [
+        "{{bundle_resources_dir}}/{{source_file_part}}",
+      ]
+    }
+  }
+
   test("modules_tests") {
     testonly = true
 
     configs += [ "..:common_config" ]
     public_configs = [ "..:common_inherited_config" ]
 
     videoprocessor_defines = []
     if (rtc_use_h264) {
       videoprocessor_defines += [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ]
     }
@@ skipping 31 matching lines @@
       "audio_coding/test/opus_test.cc",
       "audio_coding/test/target_delay_unittest.cc",
       "audio_coding/test/utility.cc",
       "rtp_rtcp/test/testFec/test_fec.cc",
       "video_coding/codecs/test/videoprocessor_integrationtest.cc",
       "video_coding/codecs/vp8/test/vp8_impl_unittest.cc",
     ]
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_native_code" ]
+      data = modules_tests_resources
       shard_timeout = 900
     }
-    if (is_android || is_ios) {
-      data = [
-        "//resources/audio_coding/testfile32kHz.pcm",
-        "//resources/audio_coding/teststereo32kHz.pcm",
-        "//resources/foreman_cif.yuv",
-        "//resources/paris_qcif.yuv",
-      ]
+
+    if (is_ios) {
+      deps += [ ":modules_tests_bundle_data" ]
     }
 
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       configs -= [ "//build/config/clang:find_bad_constructs" ]
     }
     if (is_win) {
       cflags = [
         # TODO(phoglund): get rid of 4373 supression when
         # http://code.google.com/p/webrtc/issues/detail?id=261 is solved.
         # legacy warning for ignoring const / volatile in signatures.
         "/wd4373",
       ]
     }
   }
 
+  if (is_android || is_ios) {
+    modules_unittests_resources = [
+      "//data/audio_processing/output_data_fixed.pb",
+      "//data/audio_processing/output_data_float.pb",
+      "//data/audio_processing/output_data_mac.pb",
+      "//data/voice_engine/audio_tiny48.wav",
+      "//resources/att-downlink.rx",
+      "//resources/att-uplink.rx",
+      "//resources/audio_coding/neteq_opus.rtp",
+      "//resources/audio_coding/neteq_universal_new.rtp",
+      "//resources/audio_coding/speech_mono_16kHz.pcm",
+      "//resources/audio_coding/speech_mono_32_48kHz.pcm",
+      "//resources/audio_coding/testfile32kHz.pcm",
+      "//resources/audio_coding/teststereo32kHz.pcm",
+      "//resources/audio_device/audio_short16.pcm",
+      "//resources/audio_device/audio_short44.pcm",
+      "//resources/audio_device/audio_short48.pcm",
+      "//resources/audio_processing/agc/agc_audio.pcm",
+      "//resources/audio_processing/agc/agc_no_circular_buffer.dat",
+      "//resources/audio_processing/agc/agc_pitch_gain.dat",
+      "//resources/audio_processing/agc/agc_pitch_lag.dat",
+      "//resources/audio_processing/agc/agc_spectral_peak.dat",
+      "//resources/audio_processing/agc/agc_vad.dat",
+      "//resources/audio_processing/agc/agc_voicing_prob.dat",
+      "//resources/audio_processing/agc/agc_with_circular_buffer.dat",
+      "//resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm",
+      "//resources/audio_processing/transient/audio16kHz.pcm",
+      "//resources/audio_processing/transient/audio32kHz.pcm",
+      "//resources/audio_processing/transient/audio48kHz.pcm",
+      "//resources/audio_processing/transient/audio8kHz.pcm",
+      "//resources/audio_processing/transient/detect16kHz.dat",
+      "//resources/audio_processing/transient/detect32kHz.dat",
+      "//resources/audio_processing/transient/detect48kHz.dat",
+      "//resources/audio_processing/transient/detect8kHz.dat",
+      "//resources/audio_processing/transient/double-utils.dat",
+      "//resources/audio_processing/transient/float-utils.dat",
+      "//resources/audio_processing/transient/suppressed16kHz.pcm",
+      "//resources/audio_processing/transient/suppressed32kHz.pcm",
+      "//resources/audio_processing/transient/suppressed8kHz.pcm",
+      "//resources/audio_processing/transient/wpd0.dat",
+      "//resources/audio_processing/transient/wpd1.dat",
+      "//resources/audio_processing/transient/wpd2.dat",
+      "//resources/audio_processing/transient/wpd3.dat",
+      "//resources/audio_processing/transient/wpd4.dat",
+      "//resources/audio_processing/transient/wpd5.dat",
+      "//resources/audio_processing/transient/wpd6.dat",
+      "//resources/audio_processing/transient/wpd7.dat",
+      "//resources/deflicker_before_cif_short.yuv",
+      "//resources/far16_stereo.pcm",
+      "//resources/far32_stereo.pcm",
+      "//resources/far44_stereo.pcm",
+      "//resources/far48_stereo.pcm",
+      "//resources/far8_stereo.pcm",
+      "//resources/foremanColorEnhanced_cif_short.yuv",
+      "//resources/foreman_cif.yuv",
+      "//resources/foreman_cif_short.yuv",
+      "//resources/near16_stereo.pcm",
+      "//resources/near32_stereo.pcm",
+      "//resources/near44_stereo.pcm",
+      "//resources/near48_stereo.pcm",
+      "//resources/near8_stereo.pcm",
+      "//resources/ref03.aecdump",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin",
+      "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin",
+      "//resources/short_mixed_mono_48.dat",
+      "//resources/short_mixed_mono_48_arm.dat",
+      "//resources/short_mixed_mono_48.pcm",
+      "//resources/short_mixed_stereo_48.dat",
+      "//resources/short_mixed_stereo_48.pcm",
+      "//resources/sprint-downlink.rx",
+      "//resources/sprint-uplink.rx",
+      "//resources/synthetic-trace.rx",
+      "//resources/tmobile-downlink.rx",
+      "//resources/tmobile-uplink.rx",
+      "//resources/utility/encapsulated_pcm16b_8khz.wav",
+      "//resources/utility/encapsulated_pcmu_8khz.wav",
+      "//resources/verizon3g-downlink.rx",
+      "//resources/verizon3g-uplink.rx",
+      "//resources/verizon4g-downlink.rx",
+      "//resources/verizon4g-uplink.rx",
+    ]
+  }
+
+  if (is_ios) {
+    bundle_data("modules_unittests_bundle_data") {
+      testonly = true
+      sources = modules_unittests_resources
+      outputs = [
+        "{{bundle_resources_dir}}/{{source_file_part}}",
+      ]
+    }
+  }
+
   test("modules_unittests") {
     testonly = true
 
     defines = audio_coding_defines
     deps = []
     sources = [
       "audio_coding/acm2/acm_receiver_unittest_oldapi.cc",
       "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc",
       "audio_coding/acm2/call_statistics_unittest.cc",
       "audio_coding/acm2/codec_manager_unittest.cc",
@@ skipping 385 matching lines @@
       # base/android/jni_android.h triggering it:
       # const BASE_EXPORT jobject GetApplicationContext()
       # error: type qualifiers ignored on function return type
       cflags = [ "-Wno-ignored-qualifiers" ]
       sources += [
         "audio_device/android/audio_device_unittest.cc",
         "audio_device/android/audio_manager_unittest.cc",
         "audio_device/android/ensure_initialized.cc",
         "audio_device/android/ensure_initialized.h",
       ]
+      data = modules_unittests_resources
       shard_timeout = 900
     }
-
-    if (is_android || is_ios) {
-      data = [
-        "//data/audio_processing/output_data_fixed.pb",
-        "//data/audio_processing/output_data_float.pb",
-        "//data/audio_processing/output_data_mac.pb",
-        "//data/voice_engine/audio_tiny48.wav",
-        "//resources/att-downlink.rx",
-        "//resources/att-uplink.rx",
-        "//resources/audio_coding/neteq_opus.rtp",
-        "//resources/audio_coding/neteq_universal_new.rtp",
-        "//resources/audio_coding/speech_mono_16kHz.pcm",
-        "//resources/audio_coding/speech_mono_32_48kHz.pcm",
-        "//resources/audio_coding/testfile32kHz.pcm",
-        "//resources/audio_coding/teststereo32kHz.pcm",
-        "//resources/audio_device/audio_short16.pcm",
-        "//resources/audio_device/audio_short44.pcm",
-        "//resources/audio_device/audio_short48.pcm",
-        "//resources/audio_processing/agc/agc_audio.pcm",
-        "//resources/audio_processing/agc/agc_no_circular_buffer.dat",
-        "//resources/audio_processing/agc/agc_pitch_gain.dat",
-        "//resources/audio_processing/agc/agc_pitch_lag.dat",
-        "//resources/audio_processing/agc/agc_spectral_peak.dat",
-        "//resources/audio_processing/agc/agc_vad.dat",
-        "//resources/audio_processing/agc/agc_voicing_prob.dat",
-        "//resources/audio_processing/agc/agc_with_circular_buffer.dat",
-        "//resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm",
-        "//resources/audio_processing/transient/audio16kHz.pcm",
-        "//resources/audio_processing/transient/audio32kHz.pcm",
-        "//resources/audio_processing/transient/audio48kHz.pcm",
-        "//resources/audio_processing/transient/audio8kHz.pcm",
-        "//resources/audio_processing/transient/detect16kHz.dat",
-        "//resources/audio_processing/transient/detect32kHz.dat",
-        "//resources/audio_processing/transient/detect48kHz.dat",
-        "//resources/audio_processing/transient/detect8kHz.dat",
-        "//resources/audio_processing/transient/double-utils.dat",
-        "//resources/audio_processing/transient/float-utils.dat",
-        "//resources/audio_processing/transient/suppressed16kHz.pcm",
-        "//resources/audio_processing/transient/suppressed32kHz.pcm",
-        "//resources/audio_processing/transient/suppressed8kHz.pcm",
-        "//resources/audio_processing/transient/wpd0.dat",
-        "//resources/audio_processing/transient/wpd1.dat",
-        "//resources/audio_processing/transient/wpd2.dat",
-        "//resources/audio_processing/transient/wpd3.dat",
-        "//resources/audio_processing/transient/wpd4.dat",
-        "//resources/audio_processing/transient/wpd5.dat",
-        "//resources/audio_processing/transient/wpd6.dat",
-        "//resources/audio_processing/transient/wpd7.dat",
-        "//resources/deflicker_before_cif_short.yuv",
-        "//resources/far16_stereo.pcm",
-        "//resources/far32_stereo.pcm",
-        "//resources/far44_stereo.pcm",
-        "//resources/far48_stereo.pcm",
-        "//resources/far8_stereo.pcm",
-        "//resources/foremanColorEnhanced_cif_short.yuv",
-        "//resources/foreman_cif.yuv",
-        "//resources/foreman_cif_short.yuv",
-        "//resources/near16_stereo.pcm",
-        "//resources/near32_stereo.pcm",
-        "//resources/near44_stereo.pcm",
-        "//resources/near48_stereo.pcm",
-        "//resources/near8_stereo.pcm",
-        "//resources/ref03.aecdump",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin",
-        "//resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin",
-        "//resources/short_mixed_mono_48.dat",
-        "//resources/short_mixed_mono_48_arm.dat",
-        "//resources/short_mixed_mono_48.pcm",
-        "//resources/short_mixed_stereo_48.dat",
-        "//resources/short_mixed_stereo_48.pcm",
-        "//resources/sprint-downlink.rx",
-        "//resources/sprint-uplink.rx",
-        "//resources/synthetic-trace.rx",
-        "//resources/tmobile-downlink.rx",
-        "//resources/tmobile-uplink.rx",
-        "//resources/utility/encapsulated_pcm16b_8khz.wav",
-        "//resources/utility/encapsulated_pcmu_8khz.wav",
-        "//resources/verizon3g-downlink.rx",
-        "//resources/verizon3g-uplink.rx",
-        "//resources/verizon4g-downlink.rx",
-        "//resources/verizon4g-uplink.rx",
-      ]
-    }
-
     if (is_ios) {
+      deps += [ ":modules_unittests_bundle_data" ]
       configs += [
         "..:common_objc",
         "//build/config/compiler:enable_arc",
       ]
 
       sources += [
         "audio_device/ios/audio_device_unittest_ios.cc",
         "audio_device/ios/objc/RTCAudioSessionTest.mm",
         "video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc",
       ]
 
       ldflags = [ "-ObjC" ]
-
-      # TODO(kjellander): Mac bundle files.
     }
   }
 }