iOS: Enable modules_unittests and common_audio_unittests

Instead of excluding the whole test binaries, only exclude the parts that cause the
compilation to fail for modules_unittests and common_audio_unittests.

BUG=webrtc:4752, webrtc:4755, webrtc:5544
TESTED=Successful build with:
GYP_DEFINES='OS=ios target_arch=x64' webrtc/build/gyp_webrtc
ninja -C out/Debug-iphonesimulator modules_unittests common_audio_unittests
NOTRY=True

Review URL: https://codereview.webrtc.org/1698033002

Cr-Commit-Position: refs/heads/master@{#11675}
diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp
index f0a6fc9..ca1589a 100644
--- a/webrtc/common_audio/common_audio.gyp
+++ b/webrtc/common_audio/common_audio.gyp
@@ -228,10 +228,9 @@
         },
       ],  # targets
     }],
-    ['include_tests==1 and OS!="ios"', {
+    ['include_tests==1', {
       'targets' : [
         {
-          # Does not compile on iOS: webrtc:4755.
           'target_name': 'common_audio_unittests',
           'type': '<(gtest_target_type)',
           'dependencies': [
@@ -251,7 +250,6 @@
             'resampler/resampler_unittest.cc',
             'resampler/push_resampler_unittest.cc',
             'resampler/push_sinc_resampler_unittest.cc',
-            'resampler/sinc_resampler_unittest.cc',
             'resampler/sinusoidal_linear_chirp_source.cc',
             'resampler/sinusoidal_linear_chirp_source.h',
             'ring_buffer_unittest.cc',
@@ -278,6 +276,12 @@
                 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
               ],
             }],
+            # Does not compile on iOS for arm: webrtc:5544.
+            ['OS!="ios" or target_arch!="arm"' , {
+              'sources': [
+                'resampler/sinc_resampler_unittest.cc',
+              ],
+            }],
           ],
         },
       ],  # targets
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index f1e88b7..683b355 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -117,165 +117,293 @@
             }],
           ],
         },
-      ],
-      'conditions': [
-        # Does not compile on iOS for ia32 or x64: webrtc:4755.
-        ['OS!="ios" or target_arch=="arm" or target_arch=="arm64"', {
-          'targets': [
-            {
-              'target_name': 'modules_unittests',
-              'type': '<(gtest_target_type)',
-              'defines': [
-                '<@(audio_coding_defines)',
+        {
+          'target_name': 'modules_unittests',
+          'type': '<(gtest_target_type)',
+          'defines': [
+            '<@(audio_coding_defines)',
+          ],
+          'dependencies': [
+            'acm_receive_test',
+            'acm_send_test',
+            'audio_coding_module',
+            'audio_conference_mixer',
+            'audio_device'  ,
+            'audio_processing',
+            'audioproc_test_utils',
+            'bitrate_controller',
+            'bwe_simulator',
+            'cng',
+            'isac_fix',
+            'media_file',
+            'neteq',
+            'neteq_test_support',
+            'neteq_unittest_tools',
+            'paced_sender',
+            'pcm16b',  # Needed by NetEq tests.
+            'red',
+            'remote_bitrate_estimator',
+            'rtp_rtcp',
+            'video_codecs_test_framework',
+            'video_processing',
+            'webrtc_utility',
+            'webrtc_video_coding',
+            '<@(neteq_dependencies)',
+            '<(DEPTH)/testing/gmock.gyp:gmock',
+            '<(DEPTH)/testing/gtest.gyp:gtest',
+            '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+            '<(webrtc_root)/common.gyp:webrtc_common',
+            '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
+            '<(webrtc_root)/common_video/common_video.gyp:common_video',
+            '<(webrtc_root)/modules/modules.gyp:video_capture',
+            '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8',
+            '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9',
+            '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+            '<(webrtc_root)/test/test.gyp:fake_video_frames',
+            '<(webrtc_root)/test/test.gyp:rtp_test_utils',
+            '<(webrtc_root)/test/test.gyp:test_support_main',
+            '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
+            '<(webrtc_root)/tools/tools.gyp:agc_test_utils',
+          ],
+          'sources': [
+            'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc',
+            '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',
+            'audio_coding/acm2/initial_delay_manager_unittest.cc',
+            'audio_coding/acm2/rent_a_codec_unittest.cc',
+            'audio_coding/codecs/cng/cng_unittest.cc',
+            'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc',
+            'audio_coding/codecs/isac/fix/source/filters_unittest.cc',
+            'audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc',
+            'audio_coding/codecs/isac/fix/source/transform_unittest.cc',
+            'audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc',
+            'audio_coding/codecs/isac/main/source/isac_unittest.cc',
+            'audio_coding/codecs/isac/unittest.cc',
+            'audio_coding/codecs/opus/audio_encoder_opus_unittest.cc',
+            'audio_coding/codecs/opus/opus_unittest.cc',
+            'audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc',
+            'audio_coding/neteq/audio_classifier_unittest.cc',
+            'audio_coding/neteq/audio_multi_vector_unittest.cc',
+            'audio_coding/neteq/audio_vector_unittest.cc',
+            'audio_coding/neteq/background_noise_unittest.cc',
+            'audio_coding/neteq/buffer_level_filter_unittest.cc',
+            'audio_coding/neteq/comfort_noise_unittest.cc',
+            'audio_coding/neteq/decision_logic_unittest.cc',
+            'audio_coding/neteq/decoder_database_unittest.cc',
+            'audio_coding/neteq/delay_manager_unittest.cc',
+            'audio_coding/neteq/delay_peak_detector_unittest.cc',
+            'audio_coding/neteq/dsp_helper_unittest.cc',
+            'audio_coding/neteq/dtmf_buffer_unittest.cc',
+            'audio_coding/neteq/dtmf_tone_generator_unittest.cc',
+            'audio_coding/neteq/expand_unittest.cc',
+            'audio_coding/neteq/merge_unittest.cc',
+            'audio_coding/neteq/nack_unittest.cc',
+            'audio_coding/neteq/neteq_external_decoder_unittest.cc',
+            'audio_coding/neteq/neteq_impl_unittest.cc',
+            'audio_coding/neteq/neteq_network_stats_unittest.cc',
+            'audio_coding/neteq/neteq_stereo_unittest.cc',
+            'audio_coding/neteq/neteq_unittest.cc',
+            'audio_coding/neteq/normal_unittest.cc',
+            'audio_coding/neteq/packet_buffer_unittest.cc',
+            'audio_coding/neteq/payload_splitter_unittest.cc',
+            'audio_coding/neteq/post_decode_vad_unittest.cc',
+            'audio_coding/neteq/random_vector_unittest.cc',
+            'audio_coding/neteq/sync_buffer_unittest.cc',
+            'audio_coding/neteq/timestamp_scaler_unittest.cc',
+            'audio_coding/neteq/time_stretch_unittest.cc',
+            'audio_coding/neteq/mock/mock_audio_decoder.h',
+            'audio_coding/neteq/mock/mock_audio_vector.h',
+            'audio_coding/neteq/mock/mock_buffer_level_filter.h',
+            'audio_coding/neteq/mock/mock_decoder_database.h',
+            'audio_coding/neteq/mock/mock_delay_manager.h',
+            'audio_coding/neteq/mock/mock_delay_peak_detector.h',
+            'audio_coding/neteq/mock/mock_dtmf_buffer.h',
+            'audio_coding/neteq/mock/mock_dtmf_tone_generator.h',
+            'audio_coding/neteq/mock/mock_expand.h',
+            'audio_coding/neteq/mock/mock_external_decoder_pcm16b.h',
+            'audio_coding/neteq/mock/mock_packet_buffer.h',
+            'audio_coding/neteq/mock/mock_payload_splitter.h',
+            'audio_coding/neteq/tools/input_audio_file_unittest.cc',
+            'audio_coding/neteq/tools/packet_unittest.cc',
+            'audio_conference_mixer/test/audio_conference_mixer_unittest.cc',
+            'audio_device/fine_audio_buffer_unittest.cc',
+            'audio_processing/aec/echo_cancellation_unittest.cc',
+            'audio_processing/aec/system_delay_unittest.cc',
+            'audio_processing/agc/agc_manager_direct_unittest.cc',
+            # TODO(ajm): Fix to match new interface.
+            # 'audio_processing/agc/agc_unittest.cc',
+            'audio_processing/agc/histogram_unittest.cc',
+            'audio_processing/agc/mock_agc.h',
+            'audio_processing/beamformer/array_util_unittest.cc',
+            'audio_processing/beamformer/complex_matrix_unittest.cc',
+            'audio_processing/beamformer/covariance_matrix_generator_unittest.cc',
+            'audio_processing/beamformer/matrix_unittest.cc',
+            'audio_processing/beamformer/mock_nonlinear_beamformer.h',
+            'audio_processing/beamformer/nonlinear_beamformer_unittest.cc',
+            'audio_processing/echo_cancellation_impl_unittest.cc',
+            'audio_processing/intelligibility/intelligibility_enhancer_unittest.cc',
+            'audio_processing/intelligibility/intelligibility_utils_unittest.cc',
+            'audio_processing/splitting_filter_unittest.cc',
+            'audio_processing/transient/dyadic_decimator_unittest.cc',
+            'audio_processing/transient/file_utils.cc',
+            'audio_processing/transient/file_utils.h',
+            'audio_processing/transient/file_utils_unittest.cc',
+            'audio_processing/transient/moving_moments_unittest.cc',
+            'audio_processing/transient/transient_detector_unittest.cc',
+            'audio_processing/transient/transient_suppressor_unittest.cc',
+            'audio_processing/transient/wpd_node_unittest.cc',
+            'audio_processing/transient/wpd_tree_unittest.cc',
+            'audio_processing/utility/delay_estimator_unittest.cc',
+            'audio_processing/vad/gmm_unittest.cc',
+            'audio_processing/vad/pitch_based_vad_unittest.cc',
+            'audio_processing/vad/pitch_internal_unittest.cc',
+            'audio_processing/vad/pole_zero_filter_unittest.cc',
+            'audio_processing/vad/standalone_vad_unittest.cc',
+            'audio_processing/vad/vad_audio_proc_unittest.cc',
+            'audio_processing/vad/vad_circular_buffer_unittest.cc',
+            'audio_processing/vad/voice_activity_detector_unittest.cc',
+            'bitrate_controller/bitrate_controller_unittest.cc',
+            'bitrate_controller/send_side_bandwidth_estimation_unittest.cc',
+            'media_file/media_file_unittest.cc',
+            'module_common_types_unittest.cc',
+            'pacing/bitrate_prober_unittest.cc',
+            'pacing/paced_sender_unittest.cc',
+            'pacing/packet_router_unittest.cc',
+            'remote_bitrate_estimator/bwe_simulations.cc',
+            'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h',
+            'remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h',
+            'remote_bitrate_estimator/inter_arrival_unittest.cc',
+            'remote_bitrate_estimator/overuse_detector_unittest.cc',
+            'remote_bitrate_estimator/rate_statistics_unittest.cc',
+            'remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc',
+            'remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc',
+            'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc',
+            'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h',
+            'remote_bitrate_estimator/remote_estimator_proxy_unittest.cc',
+            'remote_bitrate_estimator/send_time_history_unittest.cc',
+            'remote_bitrate_estimator/test/bwe_test_framework_unittest.cc',
+            'remote_bitrate_estimator/test/bwe_unittest.cc',
+            'remote_bitrate_estimator/test/metric_recorder_unittest.cc',
+            'remote_bitrate_estimator/test/estimators/nada_unittest.cc',
+            'remote_bitrate_estimator/transport_feedback_adapter_unittest.cc',
+            'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h',
+            'rtp_rtcp/source/byte_io_unittest.cc',
+            'rtp_rtcp/source/fec_receiver_unittest.cc',
+            'rtp_rtcp/source/fec_test_helper.cc',
+            'rtp_rtcp/source/fec_test_helper.h',
+            'rtp_rtcp/source/h264_sps_parser_unittest.cc',
+            'rtp_rtcp/source/h264_bitstream_parser_unittest.cc',
+            'rtp_rtcp/source/nack_rtx_unittest.cc',
+            'rtp_rtcp/source/packet_loss_stats_unittest.cc',
+            'rtp_rtcp/source/producer_fec_unittest.cc',
+            'rtp_rtcp/source/receive_statistics_unittest.cc',
+            'rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc',
+            'rtp_rtcp/source/rtcp_format_remb_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/app_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/bye_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/fir_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/nack_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/pli_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/remb_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/report_block_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/sdes_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/sli_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc',
+            'rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc',
+            'rtp_rtcp/source/rtcp_receiver_unittest.cc',
+            'rtp_rtcp/source/rtcp_sender_unittest.cc',
+            'rtp_rtcp/source/rtcp_utility_unittest.cc',
+            'rtp_rtcp/source/rtp_fec_unittest.cc',
+            'rtp_rtcp/source/rtp_format_h264_unittest.cc',
+            'rtp_rtcp/source/rtp_format_vp8_test_helper.cc',
+            'rtp_rtcp/source/rtp_format_vp8_test_helper.h',
+            'rtp_rtcp/source/rtp_format_vp8_unittest.cc',
+            'rtp_rtcp/source/rtp_format_vp9_unittest.cc',
+            'rtp_rtcp/source/rtp_packet_history_unittest.cc',
+            'rtp_rtcp/source/rtp_payload_registry_unittest.cc',
+            'rtp_rtcp/source/rtp_rtcp_impl_unittest.cc',
+            'rtp_rtcp/source/rtp_header_extension_unittest.cc',
+            'rtp_rtcp/source/rtp_sender_unittest.cc',
+            'rtp_rtcp/source/time_util_unittest.cc',
+            'rtp_rtcp/source/vp8_partition_aggregator_unittest.cc',
+            'rtp_rtcp/test/testAPI/test_api.cc',
+            'rtp_rtcp/test/testAPI/test_api.h',
+            'rtp_rtcp/test/testAPI/test_api_audio.cc',
+            'rtp_rtcp/test/testAPI/test_api_rtcp.cc',
+            'rtp_rtcp/test/testAPI/test_api_video.cc',
+            'utility/source/audio_frame_operations_unittest.cc',
+            'utility/source/file_player_unittests.cc',
+            'utility/source/process_thread_impl_unittest.cc',
+            'video_coding/codecs/test/packet_manipulator_unittest.cc',
+            'video_coding/codecs/test/stats_unittest.cc',
+            'video_coding/codecs/test/videoprocessor_unittest.cc',
+            'video_coding/codecs/vp8/default_temporal_layers_unittest.cc',
+            'video_coding/codecs/vp8/reference_picture_selection_unittest.cc',
+            'video_coding/codecs/vp8/screenshare_layers_unittest.cc',
+            'video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc',
+            'video_coding/codecs/vp8/simulcast_unittest.cc',
+            'video_coding/codecs/vp8/simulcast_unittest.h',
+            'video_coding/codecs/vp9/screenshare_layers_unittest.cc',
+            'video_coding/include/mock/mock_vcm_callbacks.h',
+            'video_coding/decoding_state_unittest.cc',
+            'video_coding/jitter_buffer_unittest.cc',
+            'video_coding/jitter_estimator_tests.cc',
+            'video_coding/media_optimization_unittest.cc',
+            'video_coding/receiver_unittest.cc',
+            'video_coding/session_info_unittest.cc',
+            'video_coding/timing_unittest.cc',
+            'video_coding/video_coding_robustness_unittest.cc',
+            'video_coding/video_receiver_unittest.cc',
+            'video_coding/video_sender_unittest.cc',
+            'video_coding/qm_select_unittest.cc',
+            'video_coding/test/stream_generator.cc',
+            'video_coding/test/stream_generator.h',
+            'video_coding/utility/quality_scaler_unittest.cc',
+            'video_processing/test/brightness_detection_test.cc',
+            'video_processing/test/content_metrics_test.cc',
+            'video_processing/test/deflickering_test.cc',
+            'video_processing/test/denoiser_test.cc',
+            'video_processing/test/video_processing_unittest.cc',
+            'video_processing/test/video_processing_unittest.h',
+          ],
+          'conditions': [
+            ['enable_bwe_test_logging==1', {
+              'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ],
+            }, {
+              'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
+              'sources!': [
+                'remote_bitrate_estimator/test/bwe_test_logging.cc'
               ],
+            }],
+            # Run screen/window capturer tests only on platforms where they are
+            # supported.
+            ['desktop_capture_supported==1 or OS=="android"', {
               'dependencies': [
-                'acm_receive_test',
-                'acm_send_test',
-                'audio_coding_module',
-                'audio_conference_mixer',
-                'audio_device'  ,
-                'audio_processing',
-                'audioproc_test_utils',
-                'bitrate_controller',
-                'bwe_simulator',
-                'cng',
                 'desktop_capture',
-                'isac_fix',
-                'media_file',
-                'neteq',
-                'neteq_test_support',
-                'neteq_unittest_tools',
-                'paced_sender',
-                'pcm16b',  # Needed by NetEq tests.
-                'red',
-                'remote_bitrate_estimator',
-                'rtp_rtcp',
-                'video_codecs_test_framework',
-                'video_processing',
-                'webrtc_utility',
-                'webrtc_video_coding',
-                '<@(neteq_dependencies)',
-                '<(DEPTH)/testing/gmock.gyp:gmock',
-                '<(DEPTH)/testing/gtest.gyp:gtest',
-                '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
-                '<(webrtc_root)/common.gyp:webrtc_common',
-                '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
-                '<(webrtc_root)/common_video/common_video.gyp:common_video',
-                '<(webrtc_root)/modules/modules.gyp:video_capture',
-                '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8',
-                '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9',
-                '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
-                '<(webrtc_root)/test/test.gyp:fake_video_frames',
-                '<(webrtc_root)/test/test.gyp:rtp_test_utils',
-                '<(webrtc_root)/test/test.gyp:test_support_main',
-                '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
-                '<(webrtc_root)/tools/tools.gyp:agc_test_utils',
               ],
               'sources': [
-                'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc',
-                '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',
-                'audio_coding/acm2/initial_delay_manager_unittest.cc',
-                'audio_coding/acm2/rent_a_codec_unittest.cc',
-                'audio_coding/codecs/cng/cng_unittest.cc',
-                'audio_coding/codecs/isac/fix/source/filters_unittest.cc',
-                'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc',
-                'audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc',
-                'audio_coding/codecs/isac/fix/source/transform_unittest.cc',
-                'audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc',
-                'audio_coding/codecs/isac/main/source/isac_unittest.cc',
-                'audio_coding/codecs/isac/unittest.cc',
-                'audio_coding/codecs/opus/audio_encoder_opus_unittest.cc',
-                'audio_coding/codecs/opus/opus_unittest.cc',
-                'audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc',
-                'audio_coding/neteq/audio_classifier_unittest.cc',
-                'audio_coding/neteq/audio_multi_vector_unittest.cc',
-                'audio_coding/neteq/audio_vector_unittest.cc',
-                'audio_coding/neteq/background_noise_unittest.cc',
-                'audio_coding/neteq/buffer_level_filter_unittest.cc',
-                'audio_coding/neteq/comfort_noise_unittest.cc',
-                'audio_coding/neteq/decision_logic_unittest.cc',
-                'audio_coding/neteq/decoder_database_unittest.cc',
-                'audio_coding/neteq/delay_manager_unittest.cc',
-                'audio_coding/neteq/delay_peak_detector_unittest.cc',
-                'audio_coding/neteq/dsp_helper_unittest.cc',
-                'audio_coding/neteq/dtmf_buffer_unittest.cc',
-                'audio_coding/neteq/dtmf_tone_generator_unittest.cc',
-                'audio_coding/neteq/expand_unittest.cc',
-                'audio_coding/neteq/merge_unittest.cc',
-                'audio_coding/neteq/nack_unittest.cc',
-                'audio_coding/neteq/neteq_external_decoder_unittest.cc',
-                'audio_coding/neteq/neteq_impl_unittest.cc',
-                'audio_coding/neteq/neteq_network_stats_unittest.cc',
-                'audio_coding/neteq/neteq_stereo_unittest.cc',
-                'audio_coding/neteq/neteq_unittest.cc',
-                'audio_coding/neteq/normal_unittest.cc',
-                'audio_coding/neteq/packet_buffer_unittest.cc',
-                'audio_coding/neteq/payload_splitter_unittest.cc',
-                'audio_coding/neteq/post_decode_vad_unittest.cc',
-                'audio_coding/neteq/random_vector_unittest.cc',
-                'audio_coding/neteq/sync_buffer_unittest.cc',
-                'audio_coding/neteq/timestamp_scaler_unittest.cc',
-                'audio_coding/neteq/time_stretch_unittest.cc',
-                'audio_coding/neteq/mock/mock_audio_decoder.h',
-                'audio_coding/neteq/mock/mock_audio_vector.h',
-                'audio_coding/neteq/mock/mock_buffer_level_filter.h',
-                'audio_coding/neteq/mock/mock_decoder_database.h',
-                'audio_coding/neteq/mock/mock_delay_manager.h',
-                'audio_coding/neteq/mock/mock_delay_peak_detector.h',
-                'audio_coding/neteq/mock/mock_dtmf_buffer.h',
-                'audio_coding/neteq/mock/mock_dtmf_tone_generator.h',
-                'audio_coding/neteq/mock/mock_expand.h',
-                'audio_coding/neteq/mock/mock_external_decoder_pcm16b.h',
-                'audio_coding/neteq/mock/mock_packet_buffer.h',
-                'audio_coding/neteq/mock/mock_payload_splitter.h',
-                'audio_coding/neteq/tools/input_audio_file_unittest.cc',
-                'audio_coding/neteq/tools/packet_unittest.cc',
-                'audio_conference_mixer/test/audio_conference_mixer_unittest.cc',
-                'audio_device/fine_audio_buffer_unittest.cc',
-                'audio_processing/aec/echo_cancellation_unittest.cc',
-                'audio_processing/aec/system_delay_unittest.cc',
-                'audio_processing/agc/agc_manager_direct_unittest.cc',
-                # TODO(ajm): Fix to match new interface.
-                # 'audio_processing/agc/agc_unittest.cc',
-                'audio_processing/agc/histogram_unittest.cc',
-                'audio_processing/agc/mock_agc.h',
-                'audio_processing/beamformer/array_util_unittest.cc',
-                'audio_processing/beamformer/complex_matrix_unittest.cc',
-                'audio_processing/beamformer/covariance_matrix_generator_unittest.cc',
-                'audio_processing/beamformer/matrix_unittest.cc',
-                'audio_processing/beamformer/mock_nonlinear_beamformer.h',
-                'audio_processing/beamformer/nonlinear_beamformer_unittest.cc',
-                'audio_processing/echo_cancellation_impl_unittest.cc',
-                'audio_processing/intelligibility/intelligibility_enhancer_unittest.cc',
-                'audio_processing/intelligibility/intelligibility_utils_unittest.cc',
-                'audio_processing/splitting_filter_unittest.cc',
-                'audio_processing/transient/dyadic_decimator_unittest.cc',
-                'audio_processing/transient/file_utils.cc',
-                'audio_processing/transient/file_utils.h',
-                'audio_processing/transient/file_utils_unittest.cc',
-                'audio_processing/transient/moving_moments_unittest.cc',
-                'audio_processing/transient/transient_detector_unittest.cc',
-                'audio_processing/transient/transient_suppressor_unittest.cc',
-                'audio_processing/transient/wpd_node_unittest.cc',
-                'audio_processing/transient/wpd_tree_unittest.cc',
-                'audio_processing/utility/delay_estimator_unittest.cc',
-                'audio_processing/vad/gmm_unittest.cc',
-                'audio_processing/vad/pitch_based_vad_unittest.cc',
-                'audio_processing/vad/pitch_internal_unittest.cc',
-                'audio_processing/vad/pole_zero_filter_unittest.cc',
-                'audio_processing/vad/standalone_vad_unittest.cc',
-                'audio_processing/vad/vad_audio_proc_unittest.cc',
-                'audio_processing/vad/vad_circular_buffer_unittest.cc',
-                'audio_processing/vad/voice_activity_detector_unittest.cc',
-                'bitrate_controller/bitrate_controller_unittest.cc',
-                'bitrate_controller/send_side_bandwidth_estimation_unittest.cc',
-                'desktop_capture/desktop_and_cursor_composer_unittest.cc',
                 'desktop_capture/desktop_region_unittest.cc',
                 'desktop_capture/differ_block_unittest.cc',
                 'desktop_capture/differ_unittest.cc',
+              ],
+            }],
+            ['desktop_capture_supported==1', {
+              'sources': [
+                'desktop_capture/desktop_and_cursor_composer_unittest.cc',
                 'desktop_capture/mouse_cursor_monitor_unittest.cc',
                 'desktop_capture/screen_capturer_helper_unittest.cc',
                 'desktop_capture/screen_capturer_mac_unittest.cc',
@@ -285,220 +413,185 @@
                 'desktop_capture/win/cursor_unittest.cc',
                 'desktop_capture/win/cursor_unittest_resources.h',
                 'desktop_capture/win/cursor_unittest_resources.rc',
-                'media_file/media_file_unittest.cc',
-                'module_common_types_unittest.cc',
-                'pacing/bitrate_prober_unittest.cc',
-                'pacing/paced_sender_unittest.cc',
-                'pacing/packet_router_unittest.cc',
-                'remote_bitrate_estimator/bwe_simulations.cc',
-                'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h',
-                'remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h',
-                'remote_bitrate_estimator/inter_arrival_unittest.cc',
-                'remote_bitrate_estimator/overuse_detector_unittest.cc',
-                'remote_bitrate_estimator/rate_statistics_unittest.cc',
-                'remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc',
-                'remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc',
-                'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc',
-                'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h',
-                'remote_bitrate_estimator/remote_estimator_proxy_unittest.cc',
-                'remote_bitrate_estimator/send_time_history_unittest.cc',
-                'remote_bitrate_estimator/test/bwe_test_framework_unittest.cc',
-                'remote_bitrate_estimator/test/bwe_unittest.cc',
-                'remote_bitrate_estimator/test/metric_recorder_unittest.cc',
-                'remote_bitrate_estimator/test/estimators/nada_unittest.cc',
-                'remote_bitrate_estimator/transport_feedback_adapter_unittest.cc',
-                'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h',
-                'rtp_rtcp/source/byte_io_unittest.cc',
-                'rtp_rtcp/source/fec_receiver_unittest.cc',
-                'rtp_rtcp/source/fec_test_helper.cc',
-                'rtp_rtcp/source/fec_test_helper.h',
-                'rtp_rtcp/source/h264_sps_parser_unittest.cc',
-                'rtp_rtcp/source/h264_bitstream_parser_unittest.cc',
-                'rtp_rtcp/source/nack_rtx_unittest.cc',
-                'rtp_rtcp/source/packet_loss_stats_unittest.cc',
-                'rtp_rtcp/source/producer_fec_unittest.cc',
-                'rtp_rtcp/source/receive_statistics_unittest.cc',
-                'rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc',
-                'rtp_rtcp/source/rtcp_format_remb_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/app_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/bye_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/fir_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/nack_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/pli_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/remb_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/report_block_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/sdes_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/sli_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc',
-                'rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc',
-                'rtp_rtcp/source/rtcp_receiver_unittest.cc',
-                'rtp_rtcp/source/rtcp_sender_unittest.cc',
-                'rtp_rtcp/source/rtcp_utility_unittest.cc',
-                'rtp_rtcp/source/rtp_fec_unittest.cc',
-                'rtp_rtcp/source/rtp_format_h264_unittest.cc',
-                'rtp_rtcp/source/rtp_format_vp8_test_helper.cc',
-                'rtp_rtcp/source/rtp_format_vp8_test_helper.h',
-                'rtp_rtcp/source/rtp_format_vp8_unittest.cc',
-                'rtp_rtcp/source/rtp_format_vp9_unittest.cc',
-                'rtp_rtcp/source/rtp_packet_history_unittest.cc',
-                'rtp_rtcp/source/rtp_payload_registry_unittest.cc',
-                'rtp_rtcp/source/rtp_rtcp_impl_unittest.cc',
-                'rtp_rtcp/source/rtp_header_extension_unittest.cc',
-                'rtp_rtcp/source/rtp_sender_unittest.cc',
-                'rtp_rtcp/source/time_util_unittest.cc',
-                'rtp_rtcp/source/vp8_partition_aggregator_unittest.cc',
-                'rtp_rtcp/test/testAPI/test_api.cc',
-                'rtp_rtcp/test/testAPI/test_api.h',
-                'rtp_rtcp/test/testAPI/test_api_audio.cc',
-                'rtp_rtcp/test/testAPI/test_api_rtcp.cc',
-                'rtp_rtcp/test/testAPI/test_api_video.cc',
-                'utility/source/audio_frame_operations_unittest.cc',
-                'utility/source/file_player_unittests.cc',
-                'utility/source/process_thread_impl_unittest.cc',
-                'video_coding/codecs/test/packet_manipulator_unittest.cc',
-                'video_coding/codecs/test/stats_unittest.cc',
-                'video_coding/codecs/test/videoprocessor_unittest.cc',
-                'video_coding/codecs/vp8/default_temporal_layers_unittest.cc',
-                'video_coding/codecs/vp8/reference_picture_selection_unittest.cc',
-                'video_coding/codecs/vp8/screenshare_layers_unittest.cc',
-                'video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc',
-                'video_coding/codecs/vp8/simulcast_unittest.cc',
-                'video_coding/codecs/vp8/simulcast_unittest.h',
-                'video_coding/codecs/vp9/screenshare_layers_unittest.cc',
-                'video_coding/include/mock/mock_vcm_callbacks.h',
-                'video_coding/decoding_state_unittest.cc',
-                'video_coding/jitter_buffer_unittest.cc',
-                'video_coding/jitter_estimator_tests.cc',
-                'video_coding/media_optimization_unittest.cc',
-                'video_coding/receiver_unittest.cc',
-                'video_coding/session_info_unittest.cc',
-                'video_coding/timing_unittest.cc',
-                'video_coding/video_coding_robustness_unittest.cc',
-                'video_coding/video_receiver_unittest.cc',
-                'video_coding/video_sender_unittest.cc',
-                'video_coding/qm_select_unittest.cc',
-                'video_coding/test/stream_generator.cc',
-                'video_coding/test/stream_generator.h',
-                'video_coding/utility/quality_scaler_unittest.cc',
-                'video_processing/test/brightness_detection_test.cc',
-                'video_processing/test/content_metrics_test.cc',
-                'video_processing/test/deflickering_test.cc',
-                'video_processing/test/denoiser_test.cc',
-                'video_processing/test/video_processing_unittest.cc',
-                'video_processing/test/video_processing_unittest.h',
               ],
-              'conditions': [
-                ['enable_bwe_test_logging==1', {
-                  'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ],
-                }, {
-                  'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
-                  'sources!': [
-                    'remote_bitrate_estimator/test/bwe_test_logging.cc'
-                  ],
-                }],
-                # Run screen/window capturer tests only on platforms where they are
-                # supported.
-                ['desktop_capture_supported==0', {
-                  'sources!': [
-                    'desktop_capture/desktop_and_cursor_composer_unittest.cc',
-                    'desktop_capture/mouse_cursor_monitor_unittest.cc',
-                    'desktop_capture/screen_capturer_helper_unittest.cc',
-                    'desktop_capture/screen_capturer_mac_unittest.cc',
-                    'desktop_capture/screen_capturer_mock_objects.h',
-                    'desktop_capture/screen_capturer_unittest.cc',
-                    'desktop_capture/window_capturer_unittest.cc',
-                  ],
-                }],
-                ['prefer_fixed_point==1', {
-                  'defines': [ 'WEBRTC_AUDIOPROC_FIXED_PROFILE' ],
-                }, {
-                  'defines': [ 'WEBRTC_AUDIOPROC_FLOAT_PROFILE' ],
-                }],
-                ['enable_protobuf==1', {
-                  'defines': [
-                    'WEBRTC_AUDIOPROC_DEBUG_DUMP',
-                    'WEBRTC_NETEQ_UNITTEST_BITEXACT',
-                  ],
-                  'dependencies': [
-                    'audioproc_protobuf_utils',
-                    'audioproc_unittest_proto',
-                    'neteq_unittest_proto',
-                  ],
-                  'sources': [
-                    'audio_processing/audio_processing_impl_locking_unittest.cc',
-                    'audio_processing/audio_processing_impl_unittest.cc',
-                    'audio_processing/test/audio_processing_unittest.cc',
-                    'audio_processing/test/debug_dump_test.cc',
-                    'audio_processing/test/test_utils.h',
-                  ],
-                }],
-                ['build_libvpx==1', {
-                  'dependencies': [
-                    '<(libvpx_dir)/libvpx.gyp:libvpx_new',
-                  ],
-                }],
-                ['OS=="android"', {
-                  'dependencies': [
-                    '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-                  ],
-                  # Need to disable error due to the line in
-                  # 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',
-                  ],
-                }],
-                ['OS=="ios"', {
-                  'sources': [
-                    'video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc',
-                    'audio_device/ios/audio_device_unittest_ios.cc',
-                  ],
-                  'mac_bundle_resources': [
-                    '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm',
-                    '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
-                    '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm',
-                    '<(DEPTH)/resources/audio_device/audio_short16.pcm',
-                    '<(DEPTH)/resources/audio_device/audio_short44.pcm',
-                    '<(DEPTH)/resources/audio_device/audio_short48.pcm',
-                    '<(DEPTH)/resources/audio_processing/agc/agc_no_circular_buffer.dat',
-                    '<(DEPTH)/resources/audio_processing/agc/agc_pitch_gain.dat',
-                    '<(DEPTH)/resources/audio_processing/agc/agc_pitch_lag.dat',
-                    '<(DEPTH)/resources/audio_processing/agc/agc_spectral_peak.dat',
-                    '<(DEPTH)/resources/audio_processing/agc/agc_voicing_prob.dat',
-                    '<(DEPTH)/resources/audio_processing/agc/agc_with_circular_buffer.dat',
-                    '<(DEPTH)/resources/short_mixed_mono_48.dat',
-                    '<(DEPTH)/resources/short_mixed_mono_48.pcm',
-                    '<(DEPTH)/resources/short_mixed_stereo_48.dat',
-                    '<(DEPTH)/resources/short_mixed_stereo_48.pcm',
-                  ],
-                }],
+            }],
+            ['prefer_fixed_point==1', {
+              'defines': [ 'WEBRTC_AUDIOPROC_FIXED_PROFILE' ],
+            }, {
+              'defines': [ 'WEBRTC_AUDIOPROC_FLOAT_PROFILE' ],
+            }],
+            ['enable_protobuf==1', {
+              'defines': [
+                'WEBRTC_AUDIOPROC_DEBUG_DUMP',
+                'WEBRTC_NETEQ_UNITTEST_BITEXACT',
               ],
-              # Disable warnings to enable Win64 build, issue 1323.
-              'msvs_disabled_warnings': [
-                4267,  # size_t to int truncation.
+              'dependencies': [
+                'audioproc_protobuf_utils',
+                'audioproc_unittest_proto',
+                'neteq_unittest_proto',
               ],
-            },
+              'sources': [
+                'audio_processing/audio_processing_impl_locking_unittest.cc',
+                'audio_processing/audio_processing_impl_unittest.cc',
+                'audio_processing/test/audio_processing_unittest.cc',
+                'audio_processing/test/debug_dump_test.cc',
+                'audio_processing/test/test_utils.h',
+              ],
+            }],
+            ['build_libvpx==1', {
+              'dependencies': [
+                '<(libvpx_dir)/libvpx.gyp:libvpx_new',
+              ],
+            }],
+            ['OS=="android"', {
+              'dependencies': [
+                '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+              ],
+              # Need to disable error due to the line in
+              # 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',
+              ],
+            }],
+            ['OS=="ios"', {
+              'sources': [
+                'video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc',
+                'audio_device/ios/audio_device_unittest_ios.cc',
+              ],
+              # This needs to be kept in sync with modules_unittests.isolate.
+              'mac_bundle_resources': [
+                '<(DEPTH)/data/audio_processing/output_data_float.pb',
+                '<(DEPTH)/data/audio_processing/output_data_mac.pb',
+                '<(DEPTH)/data/voice_engine/audio_tiny48.wav',
+                '<(DEPTH)/resources/att-downlink.rx',
+                '<(DEPTH)/resources/att-uplink.rx',
+                '<(DEPTH)/resources/audio_coding/neteq4_network_stats.dat',
+                '<(DEPTH)/resources/audio_coding/neteq4_opus_network_stats.dat',
+                '<(DEPTH)/resources/audio_coding/neteq4_opus_ref.pcm',
+                '<(DEPTH)/resources/audio_coding/neteq4_opus_ref_win_32.pcm',
+                '<(DEPTH)/resources/audio_coding/neteq4_opus_ref_win_64.pcm',
+                '<(DEPTH)/resources/audio_coding/neteq4_opus_rtcp_stats.dat',
+                '<(DEPTH)/resources/audio_coding/neteq4_rtcp_stats.dat',
+                '<(DEPTH)/resources/audio_coding/neteq4_universal_ref.pcm',
+                '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_32.pcm',
+                '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_64.pcm',
+                '<(DEPTH)/resources/audio_coding/neteq_opus.rtp',
+                '<(DEPTH)/resources/audio_coding/neteq_universal_new.rtp',
+                '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm',
+                '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm',
+                '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
+                '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm',
+                '<(DEPTH)/resources/audio_device/audio_short16.pcm',
+                '<(DEPTH)/resources/audio_device/audio_short44.pcm',
+                '<(DEPTH)/resources/audio_device/audio_short48.pcm',
+                '<(DEPTH)/resources/audio_processing/agc/agc_audio.pcm',
+                '<(DEPTH)/resources/audio_processing/agc/agc_no_circular_buffer.dat',
+                '<(DEPTH)/resources/audio_processing/agc/agc_pitch_gain.dat',
+                '<(DEPTH)/resources/audio_processing/agc/agc_pitch_lag.dat',
+                '<(DEPTH)/resources/audio_processing/agc/agc_spectral_peak.dat',
+                '<(DEPTH)/resources/audio_processing/agc/agc_vad.dat',
+                '<(DEPTH)/resources/audio_processing/agc/agc_voicing_prob.dat',
+                '<(DEPTH)/resources/audio_processing/agc/agc_with_circular_buffer.dat',
+                '<(DEPTH)/resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/audio16kHz.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/audio32kHz.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/audio48kHz.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/audio8kHz.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/detect16kHz.dat',
+                '<(DEPTH)/resources/audio_processing/transient/detect32kHz.dat',
+                '<(DEPTH)/resources/audio_processing/transient/detect48kHz.dat',
+                '<(DEPTH)/resources/audio_processing/transient/detect8kHz.dat',
+                '<(DEPTH)/resources/audio_processing/transient/double-utils.dat',
+                '<(DEPTH)/resources/audio_processing/transient/float-utils.dat',
+                '<(DEPTH)/resources/audio_processing/transient/suppressed16kHz.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/suppressed32kHz.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/suppressed8kHz.pcm',
+                '<(DEPTH)/resources/audio_processing/transient/wpd0.dat',
+                '<(DEPTH)/resources/audio_processing/transient/wpd1.dat',
+                '<(DEPTH)/resources/audio_processing/transient/wpd2.dat',
+                '<(DEPTH)/resources/audio_processing/transient/wpd3.dat',
+                '<(DEPTH)/resources/audio_processing/transient/wpd4.dat',
+                '<(DEPTH)/resources/audio_processing/transient/wpd5.dat',
+                '<(DEPTH)/resources/audio_processing/transient/wpd6.dat',
+                '<(DEPTH)/resources/audio_processing/transient/wpd7.dat',
+                '<(DEPTH)/resources/deflicker_before_cif_short.yuv',
+                '<(DEPTH)/resources/far16_stereo.pcm',
+                '<(DEPTH)/resources/far32_stereo.pcm',
+                '<(DEPTH)/resources/far44_stereo.pcm',
+                '<(DEPTH)/resources/far48_stereo.pcm',
+                '<(DEPTH)/resources/far8_stereo.pcm',
+                '<(DEPTH)/resources/foremanColorEnhanced_cif_short.yuv',
+                '<(DEPTH)/resources/foreman_cif.yuv',
+                '<(DEPTH)/resources/foreman_cif_short.yuv',
+                '<(DEPTH)/resources/near16_stereo.pcm',
+                '<(DEPTH)/resources/near32_stereo.pcm',
+                '<(DEPTH)/resources/near44_stereo.pcm',
+                '<(DEPTH)/resources/near48_stereo.pcm',
+                '<(DEPTH)/resources/near8_stereo.pcm',
+                '<(DEPTH)/resources/ref03.aecdump',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin',
+                '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin',
+                '<(DEPTH)/resources/short_mixed_mono_48.dat',
+                '<(DEPTH)/resources/short_mixed_mono_48_arm.dat',
+                '<(DEPTH)/resources/short_mixed_mono_48.pcm',
+                '<(DEPTH)/resources/short_mixed_stereo_48.dat',
+                '<(DEPTH)/resources/short_mixed_stereo_48.pcm',
+                '<(DEPTH)/resources/sprint-downlink.rx',
+                '<(DEPTH)/resources/sprint-uplink.rx',
+                '<(DEPTH)/resources/synthetic-trace.rx',
+                '<(DEPTH)/resources/tmobile-downlink.rx',
+                '<(DEPTH)/resources/tmobile-uplink.rx',
+                '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav',
+                '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav',
+                '<(DEPTH)/resources/verizon3g-downlink.rx',
+                '<(DEPTH)/resources/verizon3g-uplink.rx',
+                '<(DEPTH)/resources/verizon4g-downlink.rx',
+                '<(DEPTH)/resources/verizon4g-uplink.rx',
+                '<(DEPTH)/resources/video_coding/frame-ethernet-ii.pcap',
+                '<(DEPTH)/resources/video_coding/frame-loopback.pcap',
+                '<(DEPTH)/resources/video_coding/pltype103.rtp',
+                '<(DEPTH)/resources/video_coding/ssrcs-2.pcap',
+                '<(DEPTH)/resources/video_coding/ssrcs-3.pcap',
+              ],
+            }],
           ],
-        }],
+          # Disable warnings to enable Win64 build, issue 1323.
+          'msvs_disabled_warnings': [
+            4267,  # size_t to int truncation.
+          ],
+        },
+      ],
+      'conditions': [
         ['OS=="android"', {
           'targets': [
             {