Bug 1436959 - Update generated files; r=jesup
authorDan Minor <dminor@mozilla.com>
Fri, 09 Feb 2018 14:46:28 -0500
changeset 457629 ed6b43fa64c94be9c5d42005e5d3e94d03300392
parent 457628 8ea48542a4b625514a35ea8c659d43b5dfbd6f5e
child 457630 f0bc692c54980b06e4cc508a417dd4bf9b9c07e4
push id8799
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 16:46:23 +0000
treeherdermozilla-beta@15334014dc67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1436959
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1436959 - Update generated files; r=jesup MozReview-Commit-ID: CAKOhpJQoxa
media/webrtc/gn-configs/x64_False_x64_mac.json
media/webrtc/gn-configs/x64_True_x64_mac.json
media/webrtc/trunk/moz.build
media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build
media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build
media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build
media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build
media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build
media/webrtc/trunk/webrtc/call/call_gn/moz.build
media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build
media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build
media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build
media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build
media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build
media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_device/mac_portaudio_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build
media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build
media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build
media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build
media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/cpu_features_linux_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build
media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build
media/webrtc/trunk/webrtc/video/video_gn/moz.build
media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build
media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build
media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build
media/webrtc/trunk/webrtc/webrtc_gn/moz.build
--- a/media/webrtc/gn-configs/x64_False_x64_mac.json
+++ b/media/webrtc/gn-configs/x64_False_x64_mac.json
@@ -43,23 +43,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -92,17 +92,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/audio/audio_mixer.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:call_api": {
@@ -130,23 +130,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -184,17 +184,17 @@
                 "//webrtc/api:audio_mixer_api",
                 "//webrtc/api:transport_api",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_factory_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/call/audio_sink.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:transport_api": {
@@ -222,23 +222,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -269,17 +269,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/call/transport.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:video_frame_api": {
@@ -307,23 +307,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -358,17 +358,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/video/i420_buffer.cc",
                 "//webrtc/api/video/i420_buffer.h",
                 "//webrtc/api/video/video_frame.cc",
                 "//webrtc/api/video/video_frame.h",
                 "//webrtc/api/video/video_frame_buffer.h",
@@ -401,23 +401,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -452,17 +452,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/audio/utility/audio_frame_operations.cc",
                 "//webrtc/audio/utility/audio_frame_operations.h"
             ],
             "type": "static_library"
         },
@@ -491,17 +491,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -542,17 +542,17 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
@@ -603,23 +603,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -650,17 +650,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/gtest_prod_util.h"
             ],
             "type": "source_set"
         },
         "//webrtc/base:rtc_base_approved": {
@@ -688,23 +688,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -735,17 +735,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/array_view.h",
                 "//webrtc/base/arraysize.h",
                 "//webrtc/base/atomicops.h",
                 "//webrtc/base/base64.cc",
                 "//webrtc/base/base64.h",
@@ -861,23 +861,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -910,17 +910,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/numerics/exp_filter.cc",
                 "//webrtc/base/numerics/exp_filter.h",
                 "//webrtc/base/numerics/percentile_filter.h"
             ],
             "type": "static_library"
@@ -950,23 +950,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -999,17 +999,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/sequenced_task_checker.h",
                 "//webrtc/base/sequenced_task_checker_impl.cc",
                 "//webrtc/base/sequenced_task_checker_impl.h",
                 "//webrtc/base/weak_ptr.cc",
                 "//webrtc/base/weak_ptr.h",
@@ -1045,17 +1045,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1092,17 +1092,17 @@
                 "//webrtc/logging:rtc_event_log_impl",
                 "//webrtc/modules/congestion_controller:congestion_controller",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "ApplicationServices.framework",
                 "AudioToolbox.framework",
                 "CoreAudio.framework",
                 "CoreGraphics.framework",
                 "CoreVideo.framework"
             ],
@@ -1139,23 +1139,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1186,17 +1186,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/call/audio_receive_stream.h",
                 "//webrtc/call/audio_send_stream.h",
                 "//webrtc/call/audio_state.h",
                 "//webrtc/call/call.h",
                 "//webrtc/call/flexfec_receive_stream.h",
@@ -1229,17 +1229,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1268,17 +1268,17 @@
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio_c",
                 "//webrtc/common_audio:common_audio_sse2",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/audio_converter.cc",
                 "//webrtc/common_audio/audio_converter.h",
@@ -1348,23 +1348,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1395,17 +1395,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fft4g.c",
                 "//webrtc/common_audio/fft4g.h",
@@ -1489,17 +1489,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1524,17 +1524,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fir_filter_sse.cc",
                 "//webrtc/common_audio/resampler/sinc_resampler_sse.cc"
             ],
             "type": "static_library"
         },
@@ -1563,17 +1563,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1605,17 +1605,17 @@
                 "//webrtc/api:video_frame_api",
                 "//webrtc/base:rtc_task_queue",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/interface/",
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/common_video/bitrate_adjuster.cc",
@@ -1675,23 +1675,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1722,17 +1722,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/logging/rtc_event_log/rtc_event_log.h"
             ],
             "type": "source_set"
         },
         "//webrtc/logging:rtc_event_log_impl": {
@@ -1760,17 +1760,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1800,17 +1800,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/call:call_interfaces",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/logging/rtc_event_log/ringbuffer.h",
                 "//webrtc/logging/rtc_event_log/rtc_event_log.cc",
                 "//webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc",
@@ -1843,23 +1843,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1890,17 +1890,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/media/base/videoadapter.cc",
                 "//webrtc/media/base/videoadapter.h",
                 "//webrtc/media/base/videobroadcaster.cc",
                 "//webrtc/media/base/videobroadcaster.h",
                 "//webrtc/media/base/videosourcebase.cc",
@@ -1933,23 +1933,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1999,17 +1999,17 @@
                 "//webrtc/modules/audio_coding:neteq",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -2063,23 +2063,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2115,17 +2115,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_format",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
             ],
             "type": "source_set"
         },
         "//webrtc/modules/audio_coding:audio_decoder_interface": {
@@ -2153,23 +2153,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2203,17 +2203,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.h",
                 "//webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc",
                 "//webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
             ],
@@ -2244,23 +2244,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2294,17 +2294,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.h"
             ],
             "type": "static_library"
         },
@@ -2333,23 +2333,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2382,17 +2382,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format.h"
             ],
             "type": "static_library"
         },
@@ -2421,23 +2421,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2472,17 +2472,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
             ],
             "type": "static_library"
         },
@@ -2511,23 +2511,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2563,17 +2563,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor.cc",
                 "//webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc",
@@ -2623,23 +2623,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2682,17 +2682,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
@@ -2731,23 +2731,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2783,17 +2783,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -2829,23 +2829,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2882,17 +2882,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711_c"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc",
                 "//webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h",
                 "//webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc",
@@ -2925,23 +2925,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2974,17 +2974,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/g711.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711.h",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.h"
             ],
@@ -3015,23 +3015,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3068,17 +3068,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g722_c"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g722/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc",
                 "//webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h",
                 "//webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc",
@@ -3111,23 +3111,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3160,17 +3160,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/g722_decode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_encode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
@@ -3202,23 +3202,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3254,17 +3254,17 @@
             "deps": [
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_c",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc",
                 "//webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc"
             ],
@@ -3295,23 +3295,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3347,17 +3347,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -3441,23 +3441,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3491,17 +3491,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h",
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h",
                 "//webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc",
                 "//webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
             ],
@@ -3532,23 +3532,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3586,17 +3586,17 @@
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/modules/audio_coding:isac_fix_c",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -3630,23 +3630,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3685,17 +3685,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -3773,23 +3773,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3841,17 +3841,17 @@
                 "//webrtc/modules/audio_coding:isac_fix",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -3964,23 +3964,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4018,17 +4018,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:pcm16b_c"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc",
@@ -4063,23 +4063,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4112,17 +4112,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
             ],
@@ -4153,23 +4153,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4212,17 +4212,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
@@ -4263,23 +4263,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4322,17 +4322,17 @@
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:audio_network_adaptor",
                 "//webrtc/modules/audio_coding:webrtc_opus_c",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/include/opus/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc",
                 "//webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h",
@@ -4366,23 +4366,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4417,17 +4417,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/media/libopus/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/opus/opus_inst.h",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.c",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
             ],
             "type": "source_set"
@@ -4457,17 +4457,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -4498,17 +4498,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h",
                 "//webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h",
                 "//webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc",
@@ -4547,17 +4547,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -4591,17 +4591,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_device:mac_portaudio",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/audio_device/mac/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
@@ -4662,23 +4662,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4709,17 +4709,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h",
                 "//webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c",
                 "//webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h"
             ],
             "type": "source_set"
@@ -4749,23 +4749,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4799,17 +4799,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/audio/utility:utility",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.cc",
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.h"
             ],
             "type": "static_library"
         },
@@ -4838,23 +4838,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4893,17 +4893,17 @@
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_mixer:audio_frame_manipulator",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.cc",
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.h",
                 "//webrtc/modules/audio_mixer/default_output_rate_calculator.cc",
                 "//webrtc/modules/audio_mixer/default_output_rate_calculator.h",
                 "//webrtc/modules/audio_mixer/output_rate_calculator.h"
@@ -4935,23 +4935,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4995,17 +4995,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_processing:audio_processing_c",
                 "//webrtc/modules/audio_processing:audio_processing_sse2",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -5187,23 +5187,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5239,17 +5239,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_processing/agc/legacy/analog_agc.c",
                 "//webrtc/modules/audio_processing/agc/legacy/analog_agc.h",
@@ -5291,23 +5291,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5339,17 +5339,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_processing/aec/aec_core_sse2.cc",
                 "//webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc",
                 "//webrtc/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h"
             ],
             "type": "static_library"
@@ -5379,17 +5379,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5419,17 +5419,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.cc",
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.h",
                 "//webrtc/modules/bitrate_controller/include/bitrate_controller.h",
@@ -5463,17 +5463,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5509,17 +5509,17 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/congestion_controller/congestion_controller.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.h",
@@ -5564,23 +5564,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5619,17 +5619,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/desktop_capture:desktop_capture_differ_sse2",
                 "//webrtc/modules/desktop_capture:primitives",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "AppKit.framework",
                 "IOKit.framework",
                 "OpenGL.framework"
             ],
             "sources": [
                 "//webrtc/modules/desktop_capture/cropped_desktop_frame.cc",
@@ -5700,23 +5700,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5747,17 +5747,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/desktop_capture/differ_vector_sse2.cc",
                 "//webrtc/modules/desktop_capture/differ_vector_sse2.h"
             ],
             "type": "static_library"
         },
@@ -5786,23 +5786,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5835,17 +5835,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/desktop_capture/desktop_capture_types.h",
                 "//webrtc/modules/desktop_capture/desktop_frame.cc",
                 "//webrtc/modules/desktop_capture/desktop_frame.h",
                 "//webrtc/modules/desktop_capture/desktop_geometry.cc",
                 "//webrtc/modules/desktop_capture/desktop_geometry.h",
@@ -5883,17 +5883,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5923,17 +5923,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/media_file/media_file.h",
                 "//webrtc/modules/media_file/media_file_defines.h",
@@ -5969,17 +5969,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6009,17 +6009,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/pacing/alr_detector.cc",
                 "//webrtc/modules/pacing/alr_detector.h",
                 "//webrtc/modules/pacing/bitrate_prober.cc",
@@ -6056,17 +6056,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6096,17 +6096,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc",
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h",
                 "//webrtc/modules/remote_bitrate_estimator/bwe_defines.cc",
                 "//webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h",
                 "//webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h",
@@ -6153,17 +6153,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6200,17 +6200,17 @@
                 "//webrtc/call:call_interfaces",
                 "//webrtc/common_video:common_video",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/rtp_rtcp/include/flexfec_receiver.h",
@@ -6390,17 +6390,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6436,17 +6436,17 @@
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [],
             "sources": [
@@ -6454,18 +6454,16 @@
                 "//webrtc/modules/utility/include/process_thread.h",
                 "//webrtc/modules/utility/source/process_thread_impl.cc",
                 "//webrtc/modules/utility/source/process_thread_impl.h"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/video_capture:video_capture_internal_impl": {
             "cflags": [
-                "-fobjc-arc",
-                "-Wno-deprecated-declarations",
                 "-fno-strict-aliasing",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
                 "-D__TIMESTAMP__=",
                 "-fcolor-diagnostics",
                 "-arch",
@@ -6484,17 +6482,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6523,32 +6521,34 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/video_capture:video_capture_module",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "AVFoundation.framework",
                 "CoreMedia.framework",
                 "CoreVideo.framework"
             ],
             "sources": [
-                "//webrtc/modules/video_capture/objc/device_info.h",
-                "//webrtc/modules/video_capture/objc/device_info.mm",
-                "//webrtc/modules/video_capture/objc/device_info_objc.h",
-                "//webrtc/modules/video_capture/objc/device_info_objc.mm",
-                "//webrtc/modules/video_capture/objc/rtc_video_capture_objc.h",
-                "//webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm",
-                "//webrtc/modules/video_capture/objc/video_capture.h",
-                "//webrtc/modules/video_capture/objc/video_capture.mm"
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_utility.h",
+                "//webrtc/modules/video_capture/mac/video_capture_mac.mm"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/video_capture:video_capture_module": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
@@ -6572,17 +6572,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6613,17 +6613,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_capture/device_info_impl.cc",
@@ -6664,17 +6664,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6713,17 +6713,17 @@
                 "//webrtc/modules/video_coding:webrtc_h264",
                 "//webrtc/modules/video_coding:webrtc_i420",
                 "//webrtc/modules/video_coding:webrtc_vp8",
                 "//webrtc/modules/video_coding:webrtc_vp9",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codec_database.cc",
@@ -6820,17 +6820,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6861,17 +6861,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/base:rtc_numerics",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc",
@@ -6918,17 +6918,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6957,17 +6957,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/h264/h264.cc",
                 "//webrtc/modules/video_coding/codecs/h264/include/h264.h"
             ],
@@ -6998,17 +6998,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7038,17 +7038,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/i420/i420.cc",
@@ -7081,17 +7081,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7123,17 +7123,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc",
@@ -7178,17 +7178,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7218,17 +7218,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp9/include/vp9.h",
@@ -7266,17 +7266,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7309,17 +7309,17 @@
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_processing:video_processing_sse2",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
@@ -7364,17 +7364,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7402,17 +7402,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/video_processing/util/denoiser_filter_sse2.cc",
                 "//webrtc/modules/video_processing/util/denoiser_filter_sse2.h"
             ],
             "type": "static_library"
         },
@@ -7441,23 +7441,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7488,17 +7488,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/field_trial_default.h",
                 "//webrtc/system_wrappers/source/field_trial_default.cc"
             ],
             "type": "static_library"
         },
@@ -7527,23 +7527,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7574,17 +7574,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/metrics_default.h",
                 "//webrtc/system_wrappers/source/metrics_default.cc"
             ],
             "type": "static_library"
         },
@@ -7613,23 +7613,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7664,17 +7664,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/aligned_array.h",
                 "//webrtc/system_wrappers/include/aligned_malloc.h",
                 "//webrtc/system_wrappers/include/atomic32.h",
                 "//webrtc/system_wrappers/include/clock.h",
                 "//webrtc/system_wrappers/include/cpu_features_wrapper.h",
@@ -7741,17 +7741,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7794,17 +7794,17 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_coding:video_coding",
                 "//webrtc/modules/video_processing:video_processing",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "CoreVideo.framework",
                 "ApplicationServices.framework",
@@ -7879,23 +7879,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7928,17 +7928,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/video_engine/browser_capture_impl.h",
                 "//webrtc/video_engine/desktop_capture_impl.cc",
                 "//webrtc/video_engine/desktop_capture_impl.h"
             ],
             "type": "static_library"
@@ -7968,17 +7968,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8009,17 +8009,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/modules/audio_coding:audio_coding",
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/coder.cc",
                 "//webrtc/voice_engine/coder.h"
             ],
@@ -8050,17 +8050,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8091,17 +8091,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/file_player.cc",
                 "//webrtc/voice_engine/file_player.h"
@@ -8133,17 +8133,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8175,17 +8175,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/file_recorder.cc",
                 "//webrtc/voice_engine/file_recorder.h"
@@ -8217,23 +8217,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -8268,17 +8268,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/level_indicator.cc",
                 "//webrtc/voice_engine/level_indicator.h"
@@ -8310,17 +8310,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8371,17 +8371,17 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:file_player",
                 "//webrtc/voice_engine:file_recorder",
                 "//webrtc/voice_engine:level_indicator"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/include/",
@@ -8479,23 +8479,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -8545,17 +8545,17 @@
                 "//webrtc/system_wrappers:metrics_default",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video",
                 "//webrtc/video_engine:video_engine",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
@@ -8608,17 +8608,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O2",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8643,17 +8643,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_types.cc",
                 "//webrtc/common_types.h",
                 "//webrtc/config.cc",
                 "//webrtc/config.h",
                 "//webrtc/typedefs.h"
--- a/media/webrtc/gn-configs/x64_True_x64_mac.json
+++ b/media/webrtc/gn-configs/x64_True_x64_mac.json
@@ -43,23 +43,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -90,17 +90,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/audio/audio_mixer.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:call_api": {
@@ -128,23 +128,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -180,17 +180,17 @@
                 "//webrtc/api:audio_mixer_api",
                 "//webrtc/api:transport_api",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_factory_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/call/audio_sink.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:transport_api": {
@@ -218,23 +218,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -263,17 +263,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/call/transport.h"
             ],
             "type": "source_set"
         },
         "//webrtc/api:video_frame_api": {
@@ -301,23 +301,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -350,17 +350,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/api/video/i420_buffer.cc",
                 "//webrtc/api/video/i420_buffer.h",
                 "//webrtc/api/video/video_frame.cc",
                 "//webrtc/api/video/video_frame.h",
                 "//webrtc/api/video/video_frame_buffer.h",
@@ -393,23 +393,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -442,17 +442,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/audio/utility/audio_frame_operations.cc",
                 "//webrtc/audio/utility/audio_frame_operations.h"
             ],
             "type": "static_library"
         },
@@ -481,17 +481,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -530,17 +530,17 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
@@ -591,23 +591,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -636,17 +636,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/gtest_prod_util.h"
             ],
             "type": "source_set"
         },
         "//webrtc/base:rtc_base_approved": {
@@ -674,23 +674,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -719,17 +719,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/array_view.h",
                 "//webrtc/base/arraysize.h",
                 "//webrtc/base/atomicops.h",
                 "//webrtc/base/base64.cc",
                 "//webrtc/base/base64.h",
@@ -845,23 +845,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -892,17 +892,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/numerics/exp_filter.cc",
                 "//webrtc/base/numerics/exp_filter.h",
                 "//webrtc/base/numerics/percentile_filter.h"
             ],
             "type": "static_library"
@@ -932,23 +932,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -979,17 +979,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/base/sequenced_task_checker.h",
                 "//webrtc/base/sequenced_task_checker_impl.cc",
                 "//webrtc/base/sequenced_task_checker_impl.h",
                 "//webrtc/base/weak_ptr.cc",
                 "//webrtc/base/weak_ptr.h",
@@ -1025,17 +1025,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1070,17 +1070,17 @@
                 "//webrtc/logging:rtc_event_log_impl",
                 "//webrtc/modules/congestion_controller:congestion_controller",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "ApplicationServices.framework",
                 "AudioToolbox.framework",
                 "CoreAudio.framework",
                 "CoreGraphics.framework",
                 "CoreVideo.framework"
             ],
@@ -1117,23 +1117,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1162,17 +1162,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/call/audio_receive_stream.h",
                 "//webrtc/call/audio_send_stream.h",
                 "//webrtc/call/audio_state.h",
                 "//webrtc/call/call.h",
                 "//webrtc/call/flexfec_receive_stream.h",
@@ -1205,17 +1205,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1242,17 +1242,17 @@
             ],
             "deps": [
                 "//webrtc/common_audio:common_audio_c",
                 "//webrtc/common_audio:common_audio_sse2",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/audio_converter.cc",
                 "//webrtc/common_audio/audio_converter.h",
@@ -1322,23 +1322,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1367,17 +1367,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fft4g.c",
                 "//webrtc/common_audio/fft4g.h",
@@ -1461,17 +1461,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1494,17 +1494,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_audio/fir_filter_sse.cc",
                 "//webrtc/common_audio/resampler/sinc_resampler_sse.cc"
             ],
             "type": "static_library"
         },
@@ -1533,17 +1533,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1573,17 +1573,17 @@
                 "//webrtc/api:video_frame_api",
                 "//webrtc/base:rtc_task_queue",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/interface/",
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/common_video/bitrate_adjuster.cc",
@@ -1643,23 +1643,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1688,17 +1688,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/logging/rtc_event_log/rtc_event_log.h"
             ],
             "type": "source_set"
         },
         "//webrtc/logging:rtc_event_log_impl": {
@@ -1726,17 +1726,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -1764,17 +1764,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/call:call_interfaces",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/logging/rtc_event_log/ringbuffer.h",
                 "//webrtc/logging/rtc_event_log/rtc_event_log.cc",
                 "//webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc",
@@ -1807,23 +1807,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1852,17 +1852,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/media/base/videoadapter.cc",
                 "//webrtc/media/base/videoadapter.h",
                 "//webrtc/media/base/videobroadcaster.cc",
                 "//webrtc/media/base/videobroadcaster.h",
                 "//webrtc/media/base/videosourcebase.cc",
@@ -1895,23 +1895,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -1959,17 +1959,17 @@
                 "//webrtc/modules/audio_coding:neteq",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -2023,23 +2023,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2073,17 +2073,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_format",
                 "//webrtc/modules/audio_coding:audio_format_conversion"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
             ],
             "type": "source_set"
         },
         "//webrtc/modules/audio_coding:audio_decoder_interface": {
@@ -2111,23 +2111,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2159,17 +2159,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_decoder.h",
                 "//webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.cc",
                 "//webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
             ],
@@ -2200,23 +2200,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2248,17 +2248,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_encoder.h"
             ],
             "type": "static_library"
         },
@@ -2287,23 +2287,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2334,17 +2334,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format.h"
             ],
             "type": "static_library"
         },
@@ -2373,23 +2373,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2422,17 +2422,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_format"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.cc",
                 "//webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
             ],
             "type": "static_library"
         },
@@ -2461,23 +2461,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2511,17 +2511,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor.cc",
                 "//webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc",
@@ -2571,23 +2571,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2628,17 +2628,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
@@ -2677,23 +2677,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2727,17 +2727,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -2773,23 +2773,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2824,17 +2824,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711_c"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc",
                 "//webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h",
                 "//webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc",
@@ -2867,23 +2867,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -2914,17 +2914,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g711/g711.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711.h",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g711/g711_interface.h"
             ],
@@ -2955,23 +2955,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3006,17 +3006,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g722_c"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g722/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc",
                 "//webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h",
                 "//webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc",
@@ -3049,23 +3049,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3096,17 +3096,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/g722/g722_decode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_encode.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.c",
                 "//webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
@@ -3138,23 +3138,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3188,17 +3188,17 @@
             "deps": [
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_c",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc",
                 "//webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc"
             ],
@@ -3229,23 +3229,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3279,17 +3279,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -3373,23 +3373,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3421,17 +3421,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_encoder_interface"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h",
                 "//webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h",
                 "//webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc",
                 "//webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
             ],
@@ -3462,23 +3462,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3514,17 +3514,17 @@
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/modules/audio_coding:isac_fix_c",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -3558,23 +3558,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3611,17 +3611,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:isac_common",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -3699,23 +3699,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3765,17 +3765,17 @@
                 "//webrtc/modules/audio_coding:isac_fix",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/audio_coding:webrtc_opus",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/fix/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
@@ -3888,23 +3888,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -3940,17 +3940,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_coding:audio_decoder_interface",
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:pcm16b_c"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc",
@@ -3985,23 +3985,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4032,17 +4032,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
             ],
@@ -4073,23 +4073,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4130,17 +4130,17 @@
                 "//webrtc/modules/audio_coding:g711",
                 "//webrtc/modules/audio_coding:g722",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_coding:pcm16b",
                 "//webrtc/modules/audio_coding:webrtc_opus"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/cng/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/g711/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/pcm16b/include/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
@@ -4181,23 +4181,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4238,17 +4238,17 @@
                 "//webrtc/modules/audio_coding:audio_encoder_interface",
                 "//webrtc/modules/audio_coding:audio_network_adaptor",
                 "//webrtc/modules/audio_coding:webrtc_opus_c",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/include/opus/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc",
                 "//webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h",
@@ -4282,23 +4282,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4331,17 +4331,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "/media/libopus/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_coding/codecs/opus/opus_inst.h",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.c",
                 "//webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
             ],
             "type": "source_set"
@@ -4371,17 +4371,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -4410,17 +4410,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h",
                 "//webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h",
                 "//webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc",
@@ -4459,17 +4459,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -4501,17 +4501,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_device:mac_portaudio",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//webrtc/modules/audio_device/mac/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_device/include/",
                 "//webrtc/modules/audio_device/dummy/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [
@@ -4572,23 +4572,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4617,17 +4617,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h",
                 "//webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c",
                 "//webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h"
             ],
             "type": "source_set"
@@ -4657,23 +4657,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4705,17 +4705,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/audio/utility:utility",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.cc",
                 "//webrtc/modules/audio_mixer/audio_frame_manipulator.h"
             ],
             "type": "static_library"
         },
@@ -4744,23 +4744,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4797,17 +4797,17 @@
                 "//webrtc/audio/utility:audio_frame_operations",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/audio_mixer:audio_frame_manipulator",
                 "//webrtc/modules/audio_processing:audio_processing",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.cc",
                 "//webrtc/modules/audio_mixer/audio_mixer_impl.h",
                 "//webrtc/modules/audio_mixer/default_output_rate_calculator.cc",
                 "//webrtc/modules/audio_mixer/default_output_rate_calculator.h",
                 "//webrtc/modules/audio_mixer/output_rate_calculator.h"
@@ -4839,23 +4839,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -4897,17 +4897,17 @@
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/audio_coding:isac",
                 "//webrtc/modules/audio_processing:audio_processing_c",
                 "//webrtc/modules/audio_processing:audio_processing_sse2",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//",
                 "//webrtc/modules/audio_coding/codecs/isac/main/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
@@ -5089,23 +5089,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5139,17 +5139,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_processing/agc/legacy/analog_agc.c",
                 "//webrtc/modules/audio_processing/agc/legacy/analog_agc.h",
@@ -5191,23 +5191,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5237,17 +5237,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/audio_processing/aec/aec_core_sse2.cc",
                 "//webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc",
                 "//webrtc/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h"
             ],
             "type": "static_library"
@@ -5277,17 +5277,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5315,17 +5315,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.cc",
                 "//webrtc/modules/bitrate_controller/bitrate_controller_impl.h",
                 "//webrtc/modules/bitrate_controller/include/bitrate_controller.h",
@@ -5359,17 +5359,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5403,17 +5403,17 @@
                 "//webrtc/modules/pacing:pacing",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/congestion_controller/congestion_controller.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.cc",
                 "//webrtc/modules/congestion_controller/delay_based_bwe.h",
@@ -5458,23 +5458,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5511,17 +5511,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/desktop_capture:desktop_capture_differ_sse2",
                 "//webrtc/modules/desktop_capture:primitives",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "AppKit.framework",
                 "IOKit.framework",
                 "OpenGL.framework"
             ],
             "sources": [
                 "//webrtc/modules/desktop_capture/cropped_desktop_frame.cc",
@@ -5592,23 +5592,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5637,17 +5637,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/desktop_capture/differ_vector_sse2.cc",
                 "//webrtc/modules/desktop_capture/differ_vector_sse2.h"
             ],
             "type": "static_library"
         },
@@ -5676,23 +5676,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -5723,17 +5723,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/desktop_capture/desktop_capture_types.h",
                 "//webrtc/modules/desktop_capture/desktop_frame.cc",
                 "//webrtc/modules/desktop_capture/desktop_frame.h",
                 "//webrtc/modules/desktop_capture/desktop_geometry.cc",
                 "//webrtc/modules/desktop_capture/desktop_geometry.h",
@@ -5771,17 +5771,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5809,17 +5809,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/media_file/media_file.h",
                 "//webrtc/modules/media_file/media_file_defines.h",
@@ -5855,17 +5855,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5893,17 +5893,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/rtp_rtcp:rtp_rtcp",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/pacing/alr_detector.cc",
                 "//webrtc/modules/pacing/alr_detector.h",
                 "//webrtc/modules/pacing/bitrate_prober.cc",
@@ -5940,17 +5940,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -5978,17 +5978,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc",
                 "//webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h",
                 "//webrtc/modules/remote_bitrate_estimator/bwe_defines.cc",
                 "//webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h",
                 "//webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h",
@@ -6035,17 +6035,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6080,17 +6080,17 @@
                 "//webrtc/call:call_interfaces",
                 "//webrtc/common_video:common_video",
                 "//webrtc/logging:rtc_event_log_api",
                 "//webrtc/modules/remote_bitrate_estimator:remote_bitrate_estimator",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/rtp_rtcp/include/flexfec_receiver.h",
@@ -6270,17 +6270,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6314,17 +6314,17 @@
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [],
             "sources": [
@@ -6332,18 +6332,16 @@
                 "//webrtc/modules/utility/include/process_thread.h",
                 "//webrtc/modules/utility/source/process_thread_impl.cc",
                 "//webrtc/modules/utility/source/process_thread_impl.h"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/video_capture:video_capture_internal_impl": {
             "cflags": [
-                "-fobjc-arc",
-                "-Wno-deprecated-declarations",
                 "-fno-strict-aliasing",
                 "-fstack-protector-strong",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
                 "-D__TIMESTAMP__=",
                 "-fcolor-diagnostics",
                 "-arch",
@@ -6362,17 +6360,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6399,32 +6397,34 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/video_capture:video_capture_module",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "AVFoundation.framework",
                 "CoreMedia.framework",
                 "CoreVideo.framework"
             ],
             "sources": [
-                "//webrtc/modules/video_capture/objc/device_info.h",
-                "//webrtc/modules/video_capture/objc/device_info.mm",
-                "//webrtc/modules/video_capture/objc/device_info_objc.h",
-                "//webrtc/modules/video_capture/objc/device_info_objc.mm",
-                "//webrtc/modules/video_capture/objc/rtc_video_capture_objc.h",
-                "//webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm",
-                "//webrtc/modules/video_capture/objc/video_capture.h",
-                "//webrtc/modules/video_capture/objc/video_capture.mm"
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_info_objc.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.h",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.mm",
+                "//webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_utility.h",
+                "//webrtc/modules/video_capture/mac/video_capture_mac.mm"
             ],
             "type": "static_library"
         },
         "//webrtc/modules/video_capture:video_capture_module": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "-fstack-protector-strong",
                 "-Wno-builtin-macro-redefined",
@@ -6448,17 +6448,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6487,17 +6487,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_capture/device_info_impl.cc",
@@ -6538,17 +6538,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6585,17 +6585,17 @@
                 "//webrtc/modules/video_coding:webrtc_h264",
                 "//webrtc/modules/video_coding:webrtc_i420",
                 "//webrtc/modules/video_coding:webrtc_vp8",
                 "//webrtc/modules/video_coding:webrtc_vp9",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codec_database.cc",
@@ -6692,17 +6692,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6731,17 +6731,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/base:rtc_numerics",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc",
@@ -6788,17 +6788,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6825,17 +6825,17 @@
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/h264/h264.cc",
                 "//webrtc/modules/video_coding/codecs/h264/include/h264.h"
             ],
@@ -6866,17 +6866,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6904,17 +6904,17 @@
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/i420/i420.cc",
@@ -6947,17 +6947,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -6987,17 +6987,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc",
@@ -7042,17 +7042,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7080,17 +7080,17 @@
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/video_coding:video_coding_utility",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
             ],
             "sources": [
                 "//webrtc/modules/video_coding/codecs/vp9/include/vp9.h",
@@ -7128,17 +7128,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7169,17 +7169,17 @@
                 "//webrtc/common_video:common_video",
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_processing:video_processing_sse2",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/"
             ],
             "libs": [
                 "CoreVideo.framework"
@@ -7224,17 +7224,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7260,17 +7260,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/system_wrappers:system_wrappers"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/modules/video_processing/util/denoiser_filter_sse2.cc",
                 "//webrtc/modules/video_processing/util/denoiser_filter_sse2.h"
             ],
             "type": "static_library"
         },
@@ -7299,23 +7299,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7344,17 +7344,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/field_trial_default.h",
                 "//webrtc/system_wrappers/source/field_trial_default.cc"
             ],
             "type": "static_library"
         },
@@ -7383,23 +7383,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7428,17 +7428,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/metrics_default.h",
                 "//webrtc/system_wrappers/source/metrics_default.cc"
             ],
             "type": "static_library"
         },
@@ -7467,23 +7467,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7516,17 +7516,17 @@
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/system_wrappers/include/aligned_array.h",
                 "//webrtc/system_wrappers/include/aligned_malloc.h",
                 "//webrtc/system_wrappers/include/atomic32.h",
                 "//webrtc/system_wrappers/include/clock.h",
                 "//webrtc/system_wrappers/include/cpu_features_wrapper.h",
@@ -7593,17 +7593,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7644,17 +7644,17 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/modules/video_coding:video_coding",
                 "//webrtc/modules/video_processing:video_processing",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [
                 "CoreVideo.framework",
                 "ApplicationServices.framework",
@@ -7729,23 +7729,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -7776,17 +7776,17 @@
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [
                 "//webrtc:webrtc_common"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/video_engine/browser_capture_impl.h",
                 "//webrtc/video_engine/desktop_capture_impl.cc",
                 "//webrtc/video_engine/desktop_capture_impl.h"
             ],
             "type": "static_library"
@@ -7816,17 +7816,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7855,17 +7855,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/modules/audio_coding:audio_coding",
                 "//webrtc/modules/audio_coding:audio_format_conversion",
                 "//webrtc/modules/audio_coding:builtin_audio_decoder_factory",
                 "//webrtc/modules/audio_coding:rent_a_codec"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/coder.cc",
                 "//webrtc/voice_engine/coder.h"
             ],
@@ -7896,17 +7896,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -7935,17 +7935,17 @@
                 "//webrtc:webrtc_common",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/file_player.cc",
                 "//webrtc/voice_engine/file_player.h"
@@ -7977,17 +7977,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8017,17 +8017,17 @@
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio",
                 "//webrtc/modules/media_file:media_file",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:audio_coder"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/file_recorder.cc",
                 "//webrtc/voice_engine/file_recorder.h"
@@ -8059,23 +8059,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -8108,17 +8108,17 @@
             ],
             "deps": [
                 "//webrtc:webrtc_common",
                 "//webrtc/base:rtc_base_approved",
                 "//webrtc/common_audio:common_audio"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/voice_engine/level_indicator.cc",
                 "//webrtc/voice_engine/level_indicator.h"
@@ -8150,17 +8150,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8209,17 +8209,17 @@
                 "//webrtc/modules/utility:utility",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/voice_engine:file_player",
                 "//webrtc/voice_engine:file_recorder",
                 "//webrtc/voice_engine:level_indicator"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/include/",
@@ -8317,23 +8317,23 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Xclang",
                 "-load",
                 "-Xclang",
-                "../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
+                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
                 "-Xclang",
                 "-add-plugin",
                 "-Xclang",
                 "find-bad-constructs",
                 "-Xclang",
                 "-plugin-arg-find-bad-constructs",
                 "-Xclang",
                 "check-auto-raw-pointer",
@@ -8381,17 +8381,17 @@
                 "//webrtc/system_wrappers:metrics_default",
                 "//webrtc/system_wrappers:system_wrappers",
                 "//webrtc/video:video",
                 "//webrtc/video_engine:video_engine",
                 "//webrtc/voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/",
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/",
                 "//webrtc/common_audio/resampler/include/",
                 "//webrtc/common_audio/signal_processing/include/",
                 "//webrtc/common_audio/vad/include/",
                 "//webrtc/common_video/include/",
                 "//webrtc/common_video/libyuv/include/",
                 "//webrtc/modules/audio_coding/include/",
                 "//webrtc/modules/include/",
                 "//webrtc/modules/audio_conference_mixer/include/",
@@ -8444,17 +8444,17 @@
                 "-Wno-nonportable-include-path",
                 "-Wno-address-of-packed-member",
                 "-Wno-unused-lambda-capture",
                 "-Wno-user-defined-warnings",
                 "-O0",
                 "-fno-omit-frame-pointer",
                 "-gdwarf-2",
                 "-isysroot",
-                "../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
+                "../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
                 "-mmacosx-version-min=10.9",
                 "-fvisibility=hidden",
                 "-Wheader-hygiene",
                 "-Wstring-conversion",
                 "-Wtautological-overlap-compare",
                 "-Wextra",
                 "-Wno-unused-parameter",
                 "-Wno-missing-field-initializers",
@@ -8477,17 +8477,17 @@
                 "EXPAT_RELATIVE_PATH",
                 "WEBRTC_MOZILLA_BUILD",
                 "WEBRTC_POSIX",
                 "WEBRTC_MAC"
             ],
             "deps": [],
             "include_dirs": [
                 "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/gn-output/gen/"
+                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin16.7.0/media/webrtc/trunk/gn-output/gen/"
             ],
             "libs": [],
             "sources": [
                 "//webrtc/common_types.cc",
                 "//webrtc/common_types.h",
                 "//webrtc/config.cc",
                 "//webrtc/config.h",
                 "//webrtc/typedefs.h"
--- a/media/webrtc/trunk/moz.build
+++ b/media/webrtc/trunk/moz.build
@@ -2,152 +2,152 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 
 DIRS += [
-    "/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn",
-    "/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn",
-    "/media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn",
+    "/media/webrtc/trunk/webrtc/api/audio_mixer_api_gn",
+    "/media/webrtc/trunk/webrtc/api/call_api_gn",
+    "/media/webrtc/trunk/webrtc/api/transport_api_gn",
+    "/media/webrtc/trunk/webrtc/api/video_frame_api_gn",
+    "/media/webrtc/trunk/webrtc/audio/audio_gn",
+    "/media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn",
+    "/media/webrtc/trunk/webrtc/base/gtest_prod_gn",
+    "/media/webrtc/trunk/webrtc/base/rtc_base_approved_gn",
+    "/media/webrtc/trunk/webrtc/base/rtc_numerics_gn",
+    "/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn",
+    "/media/webrtc/trunk/webrtc/call/call_gn",
+    "/media/webrtc/trunk/webrtc/call/call_interfaces_gn",
+    "/media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn",
     "/media/webrtc/trunk/webrtc/common_audio/common_audio_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn",
-    "/media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn",
-    "/media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn",
-    "/media/webrtc/trunk/webrtc/call/call_gn",
-    "/media/webrtc/trunk/webrtc/modules/media_file/media_file_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn",
-    "/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn",
-    "/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn",
+    "/media/webrtc/trunk/webrtc/common_video/common_video_gn",
+    "/media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn",
     "/media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn",
+    "/media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn",
     "/media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn",
-    "/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn",
-    "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn",
     "/media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn",
-    "/media/webrtc/trunk/webrtc/common_video/common_video_gn",
-    "/media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn",
+    "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn",
+    "/media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn",
     "/media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn",
-    "/media/webrtc/trunk/webrtc/webrtc_gn",
-    "/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn",
-    "/media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn",
+    "/media/webrtc/trunk/webrtc/modules/media_file/media_file_gn",
+    "/media/webrtc/trunk/webrtc/modules/pacing/pacing_gn",
+    "/media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn",
+    "/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn",
     "/media/webrtc/trunk/webrtc/modules/utility/utility_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn",
+    "/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn",
+    "/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn",
     "/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn",
+    "/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn",
     "/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn",
-    "/media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn",
+    "/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn",
     "/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn",
-    "/media/webrtc/trunk/webrtc/api/transport_api_gn",
-    "/media/webrtc/trunk/webrtc/api/audio_mixer_api_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn",
-    "/media/webrtc/trunk/webrtc/audio/audio_gn",
-    "/media/webrtc/trunk/webrtc/api/call_api_gn",
-    "/media/webrtc/trunk/webrtc/api/video_frame_api_gn",
-    "/media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn",
-    "/media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn",
-    "/media/webrtc/trunk/webrtc/base/rtc_numerics_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn",
+    "/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn",
+    "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn",
+    "/media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn",
+    "/media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn",
+    "/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn",
+    "/media/webrtc/trunk/webrtc/video/video_gn",
     "/media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn",
     "/media/webrtc/trunk/webrtc/voice_engine/file_player_gn",
-    "/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn",
-    "/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn",
-    "/media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn",
-    "/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn",
-    "/media/webrtc/trunk/webrtc/modules/pacing/pacing_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn",
-    "/media/webrtc/trunk/webrtc/call/call_interfaces_gn",
+    "/media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn",
     "/media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn",
-    "/media/webrtc/trunk/webrtc/base/rtc_base_approved_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn",
-    "/media/webrtc/trunk/webrtc/base/gtest_prod_gn",
-    "/media/webrtc/trunk/webrtc/video/video_gn",
-    "/media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn",
-    "/media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn",
-    "/media/webrtc/trunk/webrtc/webrtc_common_gn"
+    "/media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn",
+    "/media/webrtc/trunk/webrtc/webrtc_common_gn",
+    "/media/webrtc/trunk/webrtc/webrtc_gn"
 ]
 
 if CONFIG["OS_TARGET"] == "WINNT":
 
     DIRS += [
-        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
         "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
-        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
-        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn"
+        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
     ]
 
 if CONFIG["OS_TARGET"] == "Linux":
 
     DIRS += [
-        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn",
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
         "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
-        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
         "/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_linux_gn",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
-        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn"
+        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
     ]
 
 if CONFIG["OS_TARGET"] == "Darwin":
 
     DIRS += [
-        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
         "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/audio_device/mac_portaudio_gn",
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
         "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
-        "/media/webrtc/trunk/webrtc/modules/audio_device/mac_portaudio_gn",
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
-        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn"
+        "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
     ]
 
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 
     DIRS += [
-        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
         "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
-        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn"
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
+        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
     ]
 
 if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
 
     DIRS += [
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn",
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn",
         "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn",
         "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn",
-        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn",
-        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn",
         "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn",
-        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn"
+        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
     ]
 
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
 
     DIRS += [
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn",
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn",
         "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn",
         "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn",
-        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn",
-        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn",
         "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn",
-        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn"
+        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
     ]
--- a/media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
+++ b/media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
@@ -1,135 +1,135 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 
+COMPILE_FLAGS["OS_INCLUDES"] = []
+COMPILE_FLAGS["STL"] = []
+AllowCompilerWarnings()
+
+DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["EXPAT_RELATIVE_PATH"] = True
+DEFINES["V8_DEPRECATION_WARNINGS"] = True
+DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
+DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
+
 FINAL_LIBRARY = "webrtc"
 
 
 LOCAL_INCLUDES += [
     "!/ipc/ipdl/_ipdlheaders",
     "/ipc/chromium/src",
     "/ipc/glue",
     "/media/webrtc/trunk/"
 ]
 
-COMPILE_FLAGS["STL"] = []
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["V8_DEPRECATION_WARNINGS"] = True
-DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
-DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
-DEFINES["CHROMIUM_BUILD"] = True
-DEFINES["EXPAT_RELATIVE_PATH"] = True
-
 if not CONFIG["MOZ_DEBUG"]:
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+    DEFINES["NDEBUG"] = True
     DEFINES["NVALGRIND"] = True
-    DEFINES["NDEBUG"] = True
 
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
 
-if CONFIG["OS_TARGET"] == "WINNT":
+if CONFIG["OS_TARGET"] == "Android":
 
-    DEFINES["_WIN32_WINNT"] = "0x0A00"
-    DEFINES["_HAS_EXCEPTIONS"] = "0"
-    DEFINES["_CRT_RAND_S"] = True
-    DEFINES["_USING_V110_SDK71_"] = True
-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-    DEFINES["_UNICODE"] = True
-    DEFINES["__STD_C"] = True
-    DEFINES["UNICODE"] = True
-    DEFINES["NOMINMAX"] = True
-    DEFINES["_SECURE_ATL"] = True
-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-    DEFINES["WIN32"] = True
-    DEFINES["PSAPI_VERSION"] = "1"
-    DEFINES["WEBRTC_WIN"] = True
-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-    DEFINES["_ATL_NO_OPENGL"] = True
-    DEFINES["WINVER"] = "0x0A00"
-    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+    DEFINES["ANDROID"] = True
+    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
+    DEFINES["DISABLE_NACL"] = True
+    DEFINES["HAVE_SYS_UIO_H"] = True
     DEFINES["NO_TCMALLOC"] = True
-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
-    DEFINES["_WINDOWS"] = True
-
-if CONFIG["OS_TARGET"] == "Linux":
-
+    DEFINES["USE_OPENSSL_CERTS"] = "1"
+    DEFINES["WEBRTC_ANDROID"] = True
+    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
     DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["USE_NSS_CERTS"] = "1"
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
+    DEFINES["__GNU_SOURCE"] = "1"
 
     OS_LIBS += [
         "log"
     ]
 
-    DEFINES["__GNU_SOURCE"] = "1"
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["USE_OPENSSL_CERTS"] = "1"
-    DEFINES["ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["DISABLE_NACL"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-
 if CONFIG["OS_TARGET"] == "Darwin":
 
     DEFINES["CR_XCODE_VERSION"] = "0920"
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
     DEFINES["NO_TCMALLOC"] = True
     DEFINES["WEBRTC_MAC"] = True
     DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
 
-if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["OS_TARGET"] == "Linux":
+
+    DEFINES["USE_NSS_CERTS"] = "1"
+    DEFINES["USE_X11"] = "1"
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+
+if CONFIG["OS_TARGET"] == "WINNT":
 
-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+    DEFINES["NOMINMAX"] = True
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+    DEFINES["PSAPI_VERSION"] = "1"
+    DEFINES["UNICODE"] = True
+    DEFINES["WEBRTC_WIN"] = True
+    DEFINES["WIN32"] = True
+    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+    DEFINES["WINVER"] = "0x0A00"
+    DEFINES["_ATL_NO_OPENGL"] = True
+    DEFINES["_CRT_RAND_S"] = True
+    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+    DEFINES["_HAS_EXCEPTIONS"] = "0"
+    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_SECURE_ATL"] = True
+    DEFINES["_UNICODE"] = True
+    DEFINES["_USING_V110_SDK71_"] = True
+    DEFINES["_WIN32_WINNT"] = "0x0A00"
+    DEFINES["_WINDOWS"] = True
+    DEFINES["__STD_C"] = True
 
-if CONFIG["OS_TARGET"] == "Android" and not CONFIG["MOZ_DEBUG"]:
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
-if CONFIG["OS_TARGET"] == "Darwin" and not CONFIG["MOZ_DEBUG"]:
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
 
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
-    DEFINES["WEBRTC_ARCH_ARM"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["WEBRTC_ARCH_ARM64"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
 
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+
+    DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
 Library("audio_mixer_api_gn")
--- a/media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
+++ b/media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
@@ -1,135 +1,135 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 
+COMPILE_FLAGS["OS_INCLUDES"] = []
+COMPILE_FLAGS["STL"] = []
+AllowCompilerWarnings()
+
+DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["EXPAT_RELATIVE_PATH"] = True
+DEFINES["V8_DEPRECATION_WARNINGS"] = True
+DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
+DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
+
 FINAL_LIBRARY = "webrtc"
 
 
 LOCAL_INCLUDES += [
     "!/ipc/ipdl/_ipdlheaders",
     "/ipc/chromium/src",
     "/ipc/glue",
     "/media/webrtc/trunk/"
 ]
 
-COMPILE_FLAGS["STL"] = []
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["V8_DEPRECATION_WARNINGS"] = True
-DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
-DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
-DEFINES["CHROMIUM_BUILD"] = True
-DEFINES["EXPAT_RELATIVE_PATH"] = True
-
 if not CONFIG["MOZ_DEBUG"]:
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+    DEFINES["NDEBUG"] = True
     DEFINES["NVALGRIND"] = True
-    DEFINES["NDEBUG"] = True
 
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
 
-if CONFIG["OS_TARGET"] == "WINNT":
+if CONFIG["OS_TARGET"] == "Android":
 
-    DEFINES["_WIN32_WINNT"] = "0x0A00"
-    DEFINES["_HAS_EXCEPTIONS"] = "0"
-    DEFINES["_CRT_RAND_S"] = True
-    DEFINES["_USING_V110_SDK71_"] = True
-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-    DEFINES["_UNICODE"] = True
-    DEFINES["__STD_C"] = True
-    DEFINES["UNICODE"] = True
-    DEFINES["NOMINMAX"] = True
-    DEFINES["_SECURE_ATL"] = True
-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-    DEFINES["WIN32"] = True
-    DEFINES["PSAPI_VERSION"] = "1"
-    DEFINES["WEBRTC_WIN"] = True
-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-    DEFINES["_ATL_NO_OPENGL"] = True
-    DEFINES["WINVER"] = "0x0A00"
-    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+    DEFINES["ANDROID"] = True
+    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
+    DEFINES["DISABLE_NACL"] = True
+    DEFINES["HAVE_SYS_UIO_H"] = True
     DEFINES["NO_TCMALLOC"] = True
-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
-    DEFINES["_WINDOWS"] = True
-
-if CONFIG["OS_TARGET"] == "Linux":
-
+    DEFINES["USE_OPENSSL_CERTS"] = "1"
+    DEFINES["WEBRTC_ANDROID"] = True
+    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
     DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["USE_NSS_CERTS"] = "1"
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["USE_X11"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
+    DEFINES["__GNU_SOURCE"] = "1"
 
     OS_LIBS += [
         "log"
     ]
 
-    DEFINES["__GNU_SOURCE"] = "1"
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["USE_OPENSSL_CERTS"] = "1"
-    DEFINES["ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["DISABLE_NACL"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-
 if CONFIG["OS_TARGET"] == "Darwin":
 
     DEFINES["CR_XCODE_VERSION"] = "0920"
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
     DEFINES["NO_TCMALLOC"] = True
     DEFINES["WEBRTC_MAC"] = True
     DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
 
-if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["OS_TARGET"] == "Linux":
+
+    DEFINES["USE_NSS_CERTS"] = "1"
+    DEFINES["USE_X11"] = "1"
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+
+if CONFIG["OS_TARGET"] == "WINNT":
 
-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+    DEFINES["NOMINMAX"] = True
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+    DEFINES["PSAPI_VERSION"] = "1"
+    DEFINES["UNICODE"] = True
+    DEFINES["WEBRTC_WIN"] = True
+    DEFINES["WIN32"] = True
+    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+    DEFINES["WINVER"] = "0x0A00"
+    DEFINES["_ATL_NO_OPENGL"] = True
+    DEFINES["_CRT_RAND_S"] = True
+    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+    DEFINES["_HAS_EXCEPTIONS"] = "0"
+    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_SECURE_ATL"] = True
+    DEFINES["_UNICODE"] = True
+    DEFINES["_USING_V110_SDK71_"] = True
+    DEFINES["_WIN32_WINNT"] = "0x0A00"
+    DEFINES["_WINDOWS"] = True
+    DEFINES["__STD_C"] = True
 
-if CONFIG["OS_TARGET"] == "Android" and not CONFIG["MOZ_DEBUG"]:
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
-if CONFIG["OS_TARGET"] == "Darwin" and not CONFIG["MOZ_DEBUG"]:
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
 
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
-    DEFINES["WEBRTC_ARCH_ARM"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["WEBRTC_ARCH_ARM64"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
 
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+
+    DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
 Library("call_api_gn")
--- a/media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
+++ b/media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
@@ -1,131 +1,131 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 
+COMPILE_FLAGS["OS_INCLUDES"] = []
+COMPILE_FLAGS["STL"] = []
+AllowCompilerWarnings()
+
+DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["EXPAT_RELATIVE_PATH"] = True
+DEFINES["V8_DEPRECATION_WARNINGS"] = True
+DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
+DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
+
 FINAL_LIBRARY = "webrtc"
 
 
 LOCAL_INCLUDES += [
     "!/ipc/ipdl/_ipdlheaders",
     "/ipc/chromium/src",
     "/ipc/glue",
     "/media/webrtc/trunk/"
 ]
 
-COMPILE_FLAGS["STL"] = []
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["V8_DEPRECATION_WARNINGS"] = True
-DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
-DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
-DEFINES["CHROMIUM_BUILD"] = True
-DEFINES["EXPAT_RELATIVE_PATH"] = True
-
 if not CONFIG["MOZ_DEBUG"]:
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+    DEFINES["NDEBUG"] = True
     DEFINES["NVALGRIND"] = True
-    DEFINES["NDEBUG"] = True
 
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
 
-if CONFIG["OS_TARGET"] == "WINNT":
-
-    DEFINES["_WIN32_WINNT"] = "0x0A00"
-    DEFINES["_HAS_EXCEPTIONS"] = "0"
-    DEFINES["_CRT_RAND_S"] = True
-    DEFINES["_USING_V110_SDK71_"] = True
-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-    DEFINES["_UNICODE"] = True
-    DEFINES["__STD_C"] = True
-    DEFINES["UNICODE"] = True
-    DEFINES["NOMINMAX"] = True
-    DEFINES["_SECURE_ATL"] = True
-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-    DEFINES["WIN32"] = True
-    DEFINES["PSAPI_VERSION"] = "1"
-    DEFINES["WEBRTC_WIN"] = True
-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-    DEFINES["_ATL_NO_OPENGL"] = True
-    DEFINES["WINVER"] = "0x0A00"
-    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
-    DEFINES["_WINDOWS"] = True
-
-if CONFIG["OS_TARGET"] == "Linux":
-
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["USE_NSS_CERTS"] = "1"
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["USE_X11"] = "1"
-
 if CONFIG["OS_TARGET"] == "Android":
 
-    DEFINES["__GNU_SOURCE"] = "1"
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+    DEFINES["ANDROID"] = True
     DEFINES["ANDROID_NDK_VERSION"] = "r12b"
-    DEFINES["WEBRTC_ANDROID"] = True
+    DEFINES["DISABLE_NACL"] = True
+    DEFINES["HAVE_SYS_UIO_H"] = True
+    DEFINES["NO_TCMALLOC"] = True
     DEFINES["USE_OPENSSL_CERTS"] = "1"
-    DEFINES["ANDROID"] = True
+    DEFINES["WEBRTC_ANDROID"] = True
     DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["DISABLE_NACL"] = True
+    DEFINES["WEBRTC_LINUX"] = True
     DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+    DEFINES["__GNU_SOURCE"] = "1"
 
 if CONFIG["OS_TARGET"] == "Darwin":
 
     DEFINES["CR_XCODE_VERSION"] = "0920"
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
     DEFINES["NO_TCMALLOC"] = True
     DEFINES["WEBRTC_MAC"] = True
     DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
 
-if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["OS_TARGET"] == "Linux":
+
+    DEFINES["USE_NSS_CERTS"] = "1"
+    DEFINES["USE_X11"] = "1"
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+
+if CONFIG["OS_TARGET"] == "WINNT":
+
+    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+    DEFINES["NOMINMAX"] = True
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+    DEFINES["PSAPI_VERSION"] = "1"
+    DEFINES["UNICODE"] = True
+    DEFINES["WEBRTC_WIN"] = True
+    DEFINES["WIN32"] = True
+    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+    DEFINES["WINVER"] = "0x0A00"
+    DEFINES["_ATL_NO_OPENGL"] = True
+    DEFINES["_CRT_RAND_S"] = True
+    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+    DEFINES["_HAS_EXCEPTIONS"] = "0"
+    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_SECURE_ATL"] = True
+    DEFINES["_UNICODE"] = True
+    DEFINES["_USING_V110_SDK71_"] = True
+    DEFINES["_WIN32_WINNT"] = "0x0A00"
+    DEFINES["_WINDOWS"] = True
+    DEFINES["__STD_C"] = True
+
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+
+    DEFINES["_FORTIFY_SOURCE"] = "2"
+
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
+
+    DEFINES["_FORTIFY_SOURCE"] = "2"
+
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
-if CONFIG["OS_TARGET"] == "Android" and not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["_FORTIFY_SOURCE"] = "2"
-
-if CONFIG["OS_TARGET"] == "Darwin" and not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["_FORTIFY_SOURCE"] = "2"
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["WEBRTC_ARCH_ARM"] = True
-    DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["WEBRTC_ARCH_ARM64"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
 
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+
+    DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
 Library("transport_api_gn")
--- a/media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
+++ b/media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
@@ -1,169 +1,169 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 
+COMPILE_FLAGS["OS_INCLUDES"] = []
+COMPILE_FLAGS["STL"] = []
+AllowCompilerWarnings()
+
+DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["EXPAT_RELATIVE_PATH"] = True
+DEFINES["V8_DEPRECATION_WARNINGS"] = True
+DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
+DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
+
 FINAL_LIBRARY = "webrtc"
 
 
-UNIFIED_SOURCES += [
-    "/media/webrtc/trunk/webrtc/api/video/i420_buffer.cc",
-    "/media/webrtc/trunk/webrtc/api/video/video_frame.cc"
-]
-
 LOCAL_INCLUDES += [
     "!/ipc/ipdl/_ipdlheaders",
     "/ipc/chromium/src",
     "/ipc/glue",
     "/media/libyuv/libyuv/include/",
     "/media/webrtc/trunk/"
 ]
 
-COMPILE_FLAGS["STL"] = []
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["V8_DEPRECATION_WARNINGS"] = True
-DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
-DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
-DEFINES["CHROMIUM_BUILD"] = True
-DEFINES["EXPAT_RELATIVE_PATH"] = True
+UNIFIED_SOURCES += [
+    "/media/webrtc/trunk/webrtc/api/video/i420_buffer.cc",
+    "/media/webrtc/trunk/webrtc/api/video/video_frame.cc"
+]
 
 if not CONFIG["MOZ_DEBUG"]:
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+    DEFINES["NDEBUG"] = True
     DEFINES["NVALGRIND"] = True
-    DEFINES["NDEBUG"] = True
 
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
 
-if CONFIG["OS_TARGET"] == "WINNT":
+if CONFIG["OS_TARGET"] == "Android":
+
+    DEFINES["ANDROID"] = True
+    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
+    DEFINES["DISABLE_NACL"] = True
+    DEFINES["HAVE_SYS_UIO_H"] = True
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["USE_OPENSSL_CERTS"] = "1"
+    DEFINES["WEBRTC_ANDROID"] = True
+    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+    DEFINES["__GNU_SOURCE"] = "1"
 
     OS_LIBS += [
-        "winmm"
+        "log"
     ]
 
-    DEFINES["_WIN32_WINNT"] = "0x0A00"
-    DEFINES["_HAS_EXCEPTIONS"] = "0"
-    DEFINES["_CRT_RAND_S"] = True
-    DEFINES["_USING_V110_SDK71_"] = True
-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-    DEFINES["_UNICODE"] = True
-    DEFINES["__STD_C"] = True
-    DEFINES["UNICODE"] = True
-    DEFINES["NOMINMAX"] = True
-    DEFINES["_SECURE_ATL"] = True
-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-    DEFINES["WIN32"] = True
-    DEFINES["PSAPI_VERSION"] = "1"
-    DEFINES["WEBRTC_WIN"] = True
-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-    DEFINES["_ATL_NO_OPENGL"] = True
-    DEFINES["WINVER"] = "0x0A00"
-    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+if CONFIG["OS_TARGET"] == "Darwin":
+
+    DEFINES["CR_XCODE_VERSION"] = "0920"
     DEFINES["NO_TCMALLOC"] = True
-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
-    DEFINES["_WINDOWS"] = True
+    DEFINES["WEBRTC_MAC"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
 
 if CONFIG["OS_TARGET"] == "Linux":
 
+    DEFINES["USE_NSS_CERTS"] = "1"
+    DEFINES["USE_X11"] = "1"
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+
     OS_LIBS += [
         "rt"
     ]
 
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["USE_NSS_CERTS"] = "1"
-    DEFINES["WEBRTC_POSIX"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["USE_X11"] = "1"
+if CONFIG["OS_TARGET"] == "WINNT":
 
-if CONFIG["OS_TARGET"] == "Android":
+    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+    DEFINES["NOMINMAX"] = True
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+    DEFINES["PSAPI_VERSION"] = "1"
+    DEFINES["UNICODE"] = True
+    DEFINES["WEBRTC_WIN"] = True
+    DEFINES["WIN32"] = True
+    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+    DEFINES["WINVER"] = "0x0A00"
+    DEFINES["_ATL_NO_OPENGL"] = True
+    DEFINES["_CRT_RAND_S"] = True
+    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+    DEFINES["_HAS_EXCEPTIONS"] = "0"
+    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_SECURE_ATL"] = True
+    DEFINES["_UNICODE"] = True
+    DEFINES["_USING_V110_SDK71_"] = True
+    DEFINES["_WIN32_WINNT"] = "0x0A00"
+    DEFINES["_WINDOWS"] = True
+    DEFINES["__STD_C"] = True
 
     OS_LIBS += [
-        "log"
+        "winmm"
     ]
 
-    DEFINES["__GNU_SOURCE"] = "1"
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["USE_OPENSSL_CERTS"] = "1"
-    DEFINES["ANDROID"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["DISABLE_NACL"] = True
-    DEFINES["WEBRTC_POSIX"] = True
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
-if CONFIG["OS_TARGET"] == "Darwin":
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
 
-    DEFINES["CR_XCODE_VERSION"] = "0920"
-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["WEBRTC_MAC"] = True
-    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
-if CONFIG["OS_TARGET"] == "WINNT" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
-if CONFIG["OS_TARGET"] == "Android" and not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["_FORTIFY_SOURCE"] = "2"
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
-if CONFIG["OS_TARGET"] == "Darwin" and not CONFIG["MOZ_DEBUG"]:
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
-    DEFINES["_FORTIFY_SOURCE"] = "2"
-
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
     CXXFLAGS += [
         "-mfpu=neon"
     ]
 
     DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+    CXXFLAGS += [
+        "-msse2"
+    ]
+
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
     DEFINES["WEBRTC_ARCH_ARM64"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
 
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
     CXXFLAGS += [
         "-mfpu=neon"
     ]
 
     DEFINES["WEBRTC_ARCH_ARM"] = True
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
     DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
-
-    DEFINES["WEBRTC_HAS_NEON"] = True
-    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"]:
-
-    CXXFLAGS += [
-        "-msse2"
-    ]
-
-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1":
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
     CXXFLAGS += [
         "-msse2"
     ]
 
 Library("video_frame_api_gn")
--- a/media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
+++ b/media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
@@ -1,195 +1,195 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 
+COMPILE_FLAGS["OS_INCLUDES"] = []
+COMPILE_FLAGS["STL"] = []
+AllowCompilerWarnings()
+
+DEFINES["CHROMIUM_BUILD"] = True
+DEFINES["EXPAT_RELATIVE_PATH"] = True
+DEFINES["V8_DEPRECATION_WARNINGS"] = True
+DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
+DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
+
 FINAL_LIBRARY = "webrtc"
 
 
-UNIFIED_SOURCES += [
-    "/media/webrtc/trunk/webrtc/audio/audio_receive_stream.cc",
-    "/media/webrtc/trunk/webrtc/audio/audio_send_stream.cc",
-    "/media/webrtc/trunk/webrtc/audio/audio_state.cc",
-    "/media/webrtc/trunk/webrtc/audio/audio_transport_proxy.cc"
-]
-
 LOCAL_INCLUDES += [
     "!/ipc/ipdl/_ipdlheaders",
     "/ipc/chromium/src",
     "/ipc/glue",
     "/media/webrtc/trunk/",
     "/media/webrtc/trunk/webrtc/common_audio/resampler/include/",
     "/media/webrtc/trunk/webrtc/common_audio/signal_processing/include/",
     "/media/webrtc/trunk/webrtc/common_audio/vad/include/",
     "/media/webrtc/trunk/webrtc/modules/audio_coding/include/",
     "/media/webrtc/trunk/webrtc/modules/audio_device/dummy/",
     "/media/webrtc/trunk/webrtc/modules/audio_device/include/",
     "/media/webrtc/trunk/webrtc/modules/include/",
     "/media/webrtc/trunk/webrtc/modules/include/"
 ]
 
-COMPILE_FLAGS["STL"] = []
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["V8_DEPRECATION_WARNINGS"] = True
-DEFINES["WEBRTC_RESTRICT_LOGGING"] = True
-DEFINES["WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE"] = True
-DEFINES["CHROMIUM_BUILD"] = True
-DEFINES["EXPAT_RELATIVE_PATH"] = True
+UNIFIED_SOURCES += [
+    "/media/webrtc/trunk/webrtc/audio/audio_receive_stream.cc",
+    "/media/webrtc/trunk/webrtc/audio/audio_send_stream.cc",
+    "/media/webrtc/trunk/webrtc/audio/audio_state.cc",
+    "/media/webrtc/trunk/webrtc/audio/audio_transport_proxy.cc"
+]
 
 if not CONFIG["MOZ_DEBUG"]:
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
+    DEFINES["NDEBUG"] = True
     DEFINES["NVALGRIND"] = True
-    DEFINES["NDEBUG"] = True
 
 if CONFIG["MOZ_DEBUG"] == "1":
 
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
     DEFINES["WTF_USE_DYNAMIC_ANNOTATIONS"] = "1"
 
+if CONFIG["OS_TARGET"] == "Android":
+
+    DEFINES["ANDROID"] = True
+    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
+    DEFINES["DISABLE_NACL"] = True
+    DEFINES["HAVE_SYS_UIO_H"] = True
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["USE_OPENSSL_CERTS"] = "1"
+    DEFINES["WEBRTC_ANDROID"] = True
+    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+    DEFINES["__GNU_SOURCE"] = "1"
+
+    OS_LIBS += [
+        "log",
+        "OpenSLES"
+    ]
+
+if CONFIG["OS_TARGET"] == "Darwin":
+
+    DEFINES["CR_XCODE_VERSION"] = "0920"
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["WEBRTC_MAC"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE"] = "0"
+
+    OS_LIBS += [
+        "-framework ApplicationServices",
+        "-framework AudioToolbox",
+        "-framework CoreAudio",
+        "-framework CoreGraphics",
+        "-framework CoreVideo"
+    ]
+
+if CONFIG["OS_TARGET"] == "Linux":
+
+    DEFINES["USE_NSS_CERTS"] = "1"
+    DEFINES["USE_X11"] = "1"
+    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
+    DEFINES["WEBRTC_LINUX"] = True
+    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FILE_OFFSET_BITS"] = "64"
+
+    OS_LIBS += [
+        "dl",
+        "m",
+        "rt"
+    ]
+
 if CONFIG["OS_TARGET"] == "WINNT":
 
+    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+    DEFINES["NOMINMAX"] = True
+    DEFINES["NO_TCMALLOC"] = True
+    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+    DEFINES["PSAPI_VERSION"] = "1"
+    DEFINES["UNICODE"] = True
+    DEFINES["WEBRTC_WIN"] = True
+    DEFINES["WIN32"] = True
+    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+    DEFINES["WINVER"] = "0x0A00"
+    DEFINES["_ATL_NO_OPENGL"] = True
+    DEFINES["_CRT_RAND_S"] = True
+    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
+    DEFINES["_HAS_EXCEPTIONS"] = "0"
+    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+    DEFINES["_SECURE_ATL"] = True
+    DEFINES["_UNICODE"] = True
+    DEFINES["_USING_V110_SDK71_"] = True
+    DEFINES["_WIN32_WINNT"] = "0x0A00"
+    DEFINES["_WINDOWS"] = True
+    DEFINES["__STD_C"] = True
+
     OS_LIBS += [
         "amstrmid",
         "dmoguids",
         "msdmo",
         "winmm",
         "wmcodecdspuuid"
     ]
 
-    DEFINES["_WIN32_WINNT"] = "0x0A00"
-    DEFINES["_HAS_EXCEPTIONS"] = "0"
-    DEFINES["_CRT_RAND_S"] = True
-    DEFINES["_USING_V110_SDK71_"] = True
-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-    DEFINES["_UNICODE"] = True
-    DEFINES["__STD_C"] = True
-    DEFINES["UNICODE"] = True
-    DEFINES["NOMINMAX"] = True
-    DEFINES["_SECURE_ATL"] = True
-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
-    DEFINES["WIN32"] = True
-    DEFINES["PSAPI_VERSION"] = "1"
-    DEFINES["WEBRTC_WIN"] = True
-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
-    DEFINES["_ATL_NO_OPENGL"] = True
-    DEFINES["WINVER"] = "0x0A00"
-    DEFINES["_CRT_SECURE_NO_WARNINGS"] = True
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
-    DEFINES["_WINDOWS"] = True
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
-if CONFIG["OS_TARGET"] == "Linux":
-
-    OS_LIBS += [
-        "dl",
-        "m",
-        "rt"
-    ]
-
-    DEFINES["USE_X11"] = "1"
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["USE_NSS_CERTS"] = "1"
-    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
-    DEFINES["WEBRTC_POSIX"] = True
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
-if CONFIG["OS_TARGET"] == "Android":
-
-    OS_LIBS += [
-        "log",
-        "OpenSLES"
-    ]
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin":
 
-    DEFINES["__GNU_SOURCE"] = "1"
-    DEFINES["NO_TCMALLOC"] = True
-    DEFINES["HAVE_SYS_UIO_H"] = True
-    DEFINES["WEBRTC_LINUX"] = True
-    DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["ANDROID_NDK_VERSION"] = "r12b"
-    DEFINES["WEBRTC_ANDROID"] = True
-    DEFINES["USE_OPENSSL_CERTS"] = "1"
-    DEFINES["ANDROID"] = True
-    DEFINES["WEBRTC_BUILD_LIBEVENT"] = True
-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
-    DEFINES["DISABLE_NACL"] = True
-    DEFINES["WEBRTC_POSIX"] = True
-
-if CONFIG["OS_TARGET"] == "Darwin":
+    DEFINES["_FORTIFY_SOURCE"] = "2"