Merge inbound to mozilla-central. a=merge
authorCsoregi Natalia <ncsoregi@mozilla.com>
Sat, 24 Feb 2018 12:13:21 +0200
changeset 405186 b3191953ccdabd335ffb383905a36b0062e547b2
parent 405156 bbceec48f282e25504ce27a6313329c69b61643e (current diff)
parent 405185 a6329ea89ef83aa59f0706ed8a07529c097a6ce6 (diff)
child 405187 1f44de15ffdb1c0ac9c2719efa2bbe12ea75d06b
push id33504
push userncsoregi@mozilla.com
push dateSat, 24 Feb 2018 10:13:47 +0000
treeherdermozilla-central@b3191953ccda [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone60.0a1
first release with
nightly linux32
b3191953ccda / 60.0a1 / 20180224103027 / files
nightly linux64
b3191953ccda / 60.0a1 / 20180224103027 / files
nightly mac
b3191953ccda / 60.0a1 / 20180224103027 / files
nightly win32
b3191953ccda / 60.0a1 / 20180224103027 / files
nightly win64
b3191953ccda / 60.0a1 / 20180224103027 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
xpcom/base/nsSetDllDirectory.h
--- a/devtools/client/inspector/markup/markup.js
+++ b/devtools/client/inspector/markup/markup.js
@@ -623,16 +623,22 @@ MarkupView.prototype = {
       // If the user shift-clicked (previewed) an element.
       "picker-node-previewed",
       // If the user selected an element with the browser context menu.
       "browser-context-menu",
       // If the user added a new node by clicking in the inspector toolbar.
       "node-inserted"
     ];
 
+    // If the user performed an action with a keyboard, move keyboard focus to
+    // the markup tree container.
+    if (reason && reason.endsWith("-keyboard")) {
+      this.getContainer(this._rootNode).elt.focus();
+    }
+
     if (reasonsToNavigate.includes(reason)) {
       this.getContainer(this._rootNode).elt.focus();
       this.navigate(this.getContainer(nodeFront));
     }
   },
 
   /**
    * Create a TreeWalker to find the next/previous
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -75,16 +75,17 @@ support-files =
   !/devtools/client/inspector/test/shared-head.js
   !/devtools/client/shared/test/test-actor.js
   !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_markup_accessibility_focus_blur.js]
 skip-if = os == "mac" # Full keyboard navigation on OSX only works if Full Keyboard Access setting is set to All Control in System Keyboard Preferences
 [browser_markup_accessibility_navigation.js]
 skip-if = os == "mac" # Full keyboard navigation on OSX only works if Full Keyboard Access setting is set to All Control in System Keyboard Preferences
+[browser_markup_accessibility_new_selection.js]
 [browser_markup_accessibility_navigation_after_edit.js]
 skip-if = os == "mac" # Full keyboard navigation on OSX only works if Full Keyboard Access setting is set to All Control in System Keyboard Preferences
 [browser_markup_accessibility_semantics.js]
 [browser_markup_anonymous_01.js]
 [browser_markup_anonymous_02.js]
 skip-if = e10s # scratchpad.xul is not loading in e10s window
 [browser_markup_anonymous_03.js]
 skip-if = stylo # Stylo doesn't support shadow DOM yet, bug 1293844
new file mode 100644
--- /dev/null
+++ b/devtools/client/inspector/markup/test/browser_markup_accessibility_new_selection.js
@@ -0,0 +1,26 @@
+/* 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/. */
+
+"use strict";
+
+// Test inspector markup view handling new node selection that is triggered by
+// the user keyboard action. In this case markup tree container must receive
+// keyboard focus so that further interactions continue within the markup tree.
+
+add_task(function* () {
+  let { inspector } = yield openInspectorForURL(
+    "data:text/html;charset=utf-8,<h1>foo</h1><span>bar</span>");
+  let markup = inspector.markup;
+  let doc = markup.doc;
+  let rootContainer = markup.getContainer(markup._rootNode);
+
+  is(doc.activeElement, doc.body, "Keyboard focus by default is on document body");
+
+  yield selectNode("span", inspector, "test");
+  is(doc.activeElement, doc.body, "Keyboard focus remains on document body.");
+
+  yield selectNode("h1", inspector, "test-keyboard");
+  is(doc.activeElement, rootContainer.elt,
+    "Keyboard focus must be on the markup tree conainer.");
+});
--- a/dom/plugins/base/nsPluginsDirWin.cpp
+++ b/dom/plugins/base/nsPluginsDirWin.cpp
@@ -21,51 +21,16 @@
 
 #include "windows.h"
 #include "winbase.h"
 
 #include "nsString.h"
 #include "nsIFile.h"
 #include "nsUnicharUtils.h"
 
-#include <shlwapi.h>
-#define SHOCKWAVE_BASE_FILENAME L"np32dsw"
-/**
- * Determines whether or not SetDllDirectory should be called for this plugin.
- *
- * @param pluginFilePath The full path of the plugin file
- * @return true if SetDllDirectory can be called for the plugin
- */
-bool
-ShouldProtectPluginCurrentDirectory(char16ptr_t pluginFilePath)
-{
-  LPCWSTR passedInFilename = PathFindFileName(pluginFilePath);
-  if (!passedInFilename) {
-    return true;
-  }
-
-  // Somewhere in the middle of 11.6 version of Shockwave, naming of the DLL
-  // after its version number is introduced.
-  if (!wcsicmp(passedInFilename, SHOCKWAVE_BASE_FILENAME L".dll")) {
-    return false;
-  }
-
-  // Shockwave versions before 1202122 will break if you call SetDllDirectory
-  const uint64_t kFixedShockwaveVersion = 1202122;
-  uint64_t version;
-  int found = swscanf(passedInFilename, SHOCKWAVE_BASE_FILENAME L"_%llu.dll",
-                      &version);
-  if (found && version < kFixedShockwaveVersion) {
-    return false;
-  }
-
-  // We always want to call SetDllDirectory otherwise
-  return true;
-}
-
 using namespace mozilla;
 
 /* Local helper functions */
 
 static char* GetKeyValue(void* verbuf, const WCHAR* key,
                          UINT language, UINT codepage)
 {
   WCHAR keybuf[64]; // plenty for the template below, with the longest key
@@ -278,48 +243,41 @@ nsPluginFile::~nsPluginFile()
  * Loads the plugin into memory using NSPR's shared-library loading
  * mechanism. Handles platform differences in loading shared libraries.
  */
 nsresult nsPluginFile::LoadPlugin(PRLibrary **outLibrary)
 {
   if (!mPlugin)
     return NS_ERROR_NULL_POINTER;
 
-  bool protectCurrentDirectory = true;
-
   nsAutoString pluginFilePath;
   mPlugin->GetPath(pluginFilePath);
-  protectCurrentDirectory =
-    ShouldProtectPluginCurrentDirectory(pluginFilePath.BeginReading());
 
   nsAutoString pluginFolderPath = pluginFilePath;
   int32_t idx = pluginFilePath.RFindChar('\\');
   pluginFolderPath.SetLength(idx);
 
   BOOL restoreOrigDir = FALSE;
   WCHAR aOrigDir[MAX_PATH + 1];
   DWORD dwCheck = GetCurrentDirectoryW(MAX_PATH, aOrigDir);
   NS_ASSERTION(dwCheck <= MAX_PATH + 1, "Error in Loading plugin");
 
   if (dwCheck <= MAX_PATH + 1) {
     restoreOrigDir = SetCurrentDirectoryW(pluginFolderPath.get());
     NS_ASSERTION(restoreOrigDir, "Error in Loading plugin");
   }
 
-  if (protectCurrentDirectory) {
-    SetDllDirectory(nullptr);
-  }
+  // Temporarily add the current directory back to the DLL load path.
+  SetDllDirectory(nullptr);
 
   nsresult rv = mPlugin->Load(outLibrary);
   if (NS_FAILED(rv))
       *outLibrary = nullptr;
 
-  if (protectCurrentDirectory) {
-    SetDllDirectory(L"");
-  }
+  SetDllDirectory(L"");
 
   if (restoreOrigDir) {
     DebugOnly<BOOL> bCheck = SetCurrentDirectoryW(aOrigDir);
     NS_ASSERTION(bCheck, "Error in Loading plugin");
   }
 
   return rv;
 }
--- a/dom/plugins/ipc/PluginProcessChild.cpp
+++ b/dom/plugins/ipc/PluginProcessChild.cpp
@@ -18,33 +18,30 @@
 #if defined(XP_MACOSX)
 #include "nsCocoaFeatures.h"
 // An undocumented CoreGraphics framework method, present in the same form
 // since at least OS X 10.5.
 extern "C" CGError CGSSetDebugOptions(int options);
 #endif
 
 #ifdef XP_WIN
-bool ShouldProtectPluginCurrentDirectory(char16ptr_t pluginFilePath);
 #if defined(MOZ_SANDBOX)
 #include "mozilla/sandboxTarget.h"
 #endif
 #endif
 
 using mozilla::ipc::IOThreadChild;
 
 #ifdef OS_WIN
-#include "nsSetDllDirectory.h"
 #include <algorithm>
 #endif
 
 namespace mozilla {
 namespace plugins {
 
-
 bool
 PluginProcessChild::Init(int aArgc, char* aArgv[])
 {
     nsDebugImpl::SetMultiprocessMode("NPAPI");
 
 #if defined(XP_MACOSX)
     // Remove the trigger for "dyld interposing" that we added in
     // GeckoChildProcessHost::PerformAsyncLaunchInternal(), in the host
@@ -106,30 +103,25 @@ PluginProcessChild::Init(int aArgc, char
     }
 #endif
 
 #elif defined(OS_WIN)
     std::vector<std::wstring> values =
         CommandLine::ForCurrentProcess()->GetLooseValues();
     MOZ_ASSERT(values.size() >= 1, "not enough loose args");
 
-    if (ShouldProtectPluginCurrentDirectory(values[0].c_str())) {
-        SanitizeEnvironmentVariables();
-        SetDllDirectory(L"");
-    }
-
     pluginFilename = WideToUTF8(values[0]);
 
     // We don't initialize XPCOM but we need the thread manager and the
     // logging framework for the FunctionBroker.
-    NS_SetMainThread();
-    mozilla::TimeStamp::Startup();
-    NS_LogInit();
+    NS_SetMainThread();
+    mozilla::TimeStamp::Startup();
+    NS_LogInit();
     mozilla::LogModule::Init();
-    nsThreadManager::get().Init();
+    nsThreadManager::get().Init();
 
 #if defined(MOZ_SANDBOX)
     // This is probably the earliest we would want to start the sandbox.
     // As we attempt to tighten the sandbox, we may need to consider moving this
     // to later in the plugin initialization.
     mozilla::SandboxTarget::Instance()->StartSandbox();
 #endif
 #else
@@ -157,24 +149,24 @@ PluginProcessChild::Init(int aArgc, char
 #endif
     return retval;
 }
 
 void
 PluginProcessChild::CleanUp()
 {
 #if defined(OS_WIN)
-    MOZ_ASSERT(NS_IsMainThread());
-
-    // Shutdown components we started in Init.  Note that KillClearOnShutdown
-    // is an event that is regularly part of XPCOM shutdown.  We do not
-    // call XPCOM's shutdown but we need this event to be sent to avoid
-    // leaking objects labeled as ClearOnShutdown.
-    nsThreadManager::get().Shutdown();
-    mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
+    MOZ_ASSERT(NS_IsMainThread());
+
+    // Shutdown components we started in Init.  Note that KillClearOnShutdown
+    // is an event that is regularly part of XPCOM shutdown.  We do not
+    // call XPCOM's shutdown but we need this event to be sent to avoid
+    // leaking objects labeled as ClearOnShutdown.
+    nsThreadManager::get().Shutdown();
+    mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
     NS_LogTerm();
 #endif
 
     nsRegion::ShutdownStatic();
 }
 
 } // namespace plugins
 } // namespace mozilla
--- a/dom/xbl/nsXBLDocumentInfo.cpp
+++ b/dom/xbl/nsXBLDocumentInfo.cpp
@@ -293,17 +293,17 @@ nsXBLDocumentInfo::WritePrototypeBinding
   stream->Close();
   NS_ENSURE_SUCCESS(rv, rv);
 
   uint32_t len;
   UniquePtr<char[]> buf;
   rv = NewBufferFromStorageStream(storageStream, &buf, &len);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return startupCache->PutBuffer(spec.get(), buf.get(), len);
+  return startupCache->PutBuffer(spec.get(), Move(buf), len);
 }
 
 void
 nsXBLDocumentInfo::SetFirstPrototypeBinding(nsXBLPrototypeBinding* aBinding)
 {
   mFirstBinding = aBinding;
 }
 
--- a/dom/xul/nsXULPrototypeCache.cpp
+++ b/dom/xul/nsXULPrototypeCache.cpp
@@ -441,17 +441,17 @@ nsXULPrototypeCache::FinishOutputStream(
     rv = NewBufferFromStorageStream(storageStream, &buf, &len);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!mStartupCacheURITable.GetEntry(uri)) {
         nsAutoCString spec(kXULCachePrefix);
         rv = PathifyURI(uri, spec);
         if (NS_FAILED(rv))
             return NS_ERROR_NOT_AVAILABLE;
-        rv = sc->PutBuffer(spec.get(), buf.get(), len);
+        rv = sc->PutBuffer(spec.get(), Move(buf), len);
         if (NS_SUCCEEDED(rv)) {
             mOutputStreamTable.Remove(uri);
             mStartupCacheURITable.PutEntry(uri);
         }
     }
 
     return rv;
 }
@@ -586,17 +586,17 @@ nsXULPrototypeCache::BeginCaching(nsIURI
                 rv = NS_ERROR_FILE_TOO_BIG;
             }
         }
 
         if (NS_SUCCEEDED(rv)) {
             buf = MakeUnique<char[]>(len);
             rv = inputStream->Read(buf.get(), len, &amtRead);
             if (NS_SUCCEEDED(rv) && len == amtRead)
-              rv = startupCache->PutBuffer(kXULCacheInfoKey, buf.get(), len);
+              rv = startupCache->PutBuffer(kXULCacheInfoKey, Move(buf), len);
             else {
                 rv = NS_ERROR_UNEXPECTED;
             }
         }
 
         // Failed again, just bail.
         if (NS_FAILED(rv)) {
             startupCache->InvalidateCache();
--- a/dom/xul/nsXULPrototypeDocument.cpp
+++ b/dom/xul/nsXULPrototypeDocument.cpp
@@ -194,16 +194,17 @@ nsXULPrototypeDocument::Read(nsIObjectIn
     }
 
     // Document contents
     uint32_t type;
     while (NS_SUCCEEDED(rv)) {
         tmp = aStream->Read32(&type);
         if (NS_FAILED(tmp)) {
           rv = tmp;
+          break;
         }
 
         if ((nsXULPrototypeNode::Type)type == nsXULPrototypeNode::eType_PI) {
             RefPtr<nsXULPrototypePI> pi = new nsXULPrototypePI();
 
             tmp = pi->Deserialize(aStream, this, mURI, &nodeInfos);
             if (NS_FAILED(tmp)) {
               rv = tmp;
--- a/gfx/layers/wr/WebRenderCommandBuilder.cpp
+++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp
@@ -54,30 +54,31 @@ WebRenderCommandBuilder::NeedsEmptyTrans
 }
 
 void
 WebRenderCommandBuilder::BuildWebRenderCommands(wr::DisplayListBuilder& aBuilder,
                                                 wr::IpcResourceUpdateQueue& aResourceUpdates,
                                                 nsDisplayList* aDisplayList,
                                                 nsDisplayListBuilder* aDisplayListBuilder,
                                                 WebRenderScrollData& aScrollData,
-                                                wr::LayoutSize& aContentSize)
+                                                wr::LayoutSize& aContentSize,
+                                                const nsTArray<wr::WrFilterOp>& aFilters)
 {
   { // scoping for StackingContextHelper RAII
 
     StackingContextHelper sc;
     mParentCommands.Clear();
     aScrollData = WebRenderScrollData(mManager);
     MOZ_ASSERT(mLayerScrollData.empty());
     mLastCanvasDatas.Clear();
     mLastAsr = nullptr;
     mScrollingHelper.BeginBuild(mManager, aBuilder);
 
     {
-      StackingContextHelper pageRootSc(sc, aBuilder);
+      StackingContextHelper pageRootSc(sc, aBuilder, aFilters);
       CreateWebRenderCommandsFromDisplayList(aDisplayList, aDisplayListBuilder,
                                              pageRootSc, aBuilder, aResourceUpdates);
     }
 
     // Make a "root" layer data that has everything else as descendants
     mLayerScrollData.emplace_back();
     mLayerScrollData.back().InitializeRoot(mLayerScrollData.size() - 1);
     auto callback = [&aScrollData](FrameMetrics::ViewID aScrollId) -> bool {
--- a/gfx/layers/wr/WebRenderCommandBuilder.h
+++ b/gfx/layers/wr/WebRenderCommandBuilder.h
@@ -46,17 +46,18 @@ public:
 
   bool NeedsEmptyTransaction();
 
   void BuildWebRenderCommands(wr::DisplayListBuilder& aBuilder,
                               wr::IpcResourceUpdateQueue& aResourceUpdates,
                               nsDisplayList* aDisplayList,
                               nsDisplayListBuilder* aDisplayListBuilder,
                               WebRenderScrollData& aScrollData,
-                              wr::LayoutSize& aContentSize);
+                              wr::LayoutSize& aContentSize,
+                              const nsTArray<wr::WrFilterOp>& aFilters);
 
   Maybe<wr::ImageKey> CreateImageKey(nsDisplayItem* aItem,
                                      ImageContainer* aContainer,
                                      mozilla::wr::DisplayListBuilder& aBuilder,
                                      mozilla::wr::IpcResourceUpdateQueue& aResources,
                                      const StackingContextHelper& aSc,
                                      gfx::IntSize& aSize,
                                      const Maybe<LayoutDeviceRect>& aAsyncImageBounds);
--- a/gfx/layers/wr/WebRenderLayerManager.cpp
+++ b/gfx/layers/wr/WebRenderLayerManager.cpp
@@ -244,17 +244,18 @@ WebRenderLayerManager::EndTransaction(Dr
 {
   // This should never get called, all callers should use
   // EndTransactionWithoutLayer instead.
   MOZ_ASSERT(false);
 }
 
 void
 WebRenderLayerManager::EndTransactionWithoutLayer(nsDisplayList* aDisplayList,
-                                                  nsDisplayListBuilder* aDisplayListBuilder)
+                                                  nsDisplayListBuilder* aDisplayListBuilder,
+                                                  const nsTArray<wr::WrFilterOp>& aFilters)
 {
   MOZ_ASSERT(aDisplayList && aDisplayListBuilder);
   WrBridge()->RemoveExpiredFontKeys();
 
   AUTO_PROFILER_TRACING("Paint", "RenderLayers");
 
 #if DUMP_LISTS
   // Useful for debugging, it dumps the display list *before* we try to build
@@ -277,17 +278,18 @@ WebRenderLayerManager::EndTransactionWit
   wr::DisplayListBuilder builder(WrBridge()->GetPipeline(), contentSize, mLastDisplayListSize);
   wr::IpcResourceUpdateQueue resourceUpdates(WrBridge());
 
   mWebRenderCommandBuilder.BuildWebRenderCommands(builder,
                                                   resourceUpdates,
                                                   aDisplayList,
                                                   aDisplayListBuilder,
                                                   mScrollData,
-                                                  contentSize);
+                                                  contentSize,
+                                                  aFilters);
 
   mWidget->AddWindowOverlayWebRenderCommands(WrBridge(), builder, resourceUpdates);
   mWindowOverlayChanged = false;
 
   WrBridge()->ClearReadLocks();
 
   if (AsyncPanZoomEnabled()) {
     mScrollData.SetFocusTarget(mFocusTarget);
--- a/gfx/layers/wr/WebRenderLayerManager.h
+++ b/gfx/layers/wr/WebRenderLayerManager.h
@@ -64,17 +64,18 @@ public:
   virtual CompositorBridgeChild* GetCompositorBridgeChild() override;
 
   virtual int32_t GetMaxTextureSize() const override;
 
   virtual bool BeginTransactionWithTarget(gfxContext* aTarget) override;
   virtual bool BeginTransaction() override;
   virtual bool EndEmptyTransaction(EndTransactionFlags aFlags = END_DEFAULT) override;
   void EndTransactionWithoutLayer(nsDisplayList* aDisplayList,
-                                  nsDisplayListBuilder* aDisplayListBuilder);
+                                  nsDisplayListBuilder* aDisplayListBuilder,
+                                  const nsTArray<wr::WrFilterOp>& aFilters = nsTArray<wr::WrFilterOp>());
   virtual void EndTransaction(DrawPaintedLayerCallback aCallback,
                               void* aCallbackData,
                               EndTransactionFlags aFlags = END_DEFAULT) override;
 
   virtual LayersBackend GetBackendType() override { return LayersBackend::LAYERS_WR; }
   virtual void GetBackendName(nsAString& name) override { name.AssignLiteral("WebRender"); }
   virtual const char* Name() const override { return "WebRender"; }
 
--- a/gfx/thebes/gfxFT2FontList.cpp
+++ b/gfx/thebes/gfxFT2FontList.cpp
@@ -8,16 +8,17 @@
 #include "mozilla/MemoryReporting.h"
 
 #include "mozilla/dom/ContentChild.h"
 #include "gfxAndroidPlatform.h"
 #include "mozilla/Omnijar.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsIInputStream.h"
+#include "nsReadableUtils.h"
 
 #include "nsXULAppAPI.h"
 #include <dirent.h>
 #include <android/log.h>
 #define ALOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gecko" , ## args)
 
 #include "ft2build.h"
 #include FT_FREETYPE_H
@@ -721,17 +722,19 @@ public:
             buf.Append(';');
             buf.Append(entry->mFaces);
             buf.Append(';');
             buf.AppendInt(entry->mTimestamp);
             buf.Append(';');
             buf.AppendInt(entry->mFilesize);
             buf.Append(';');
         }
-        mCache->PutBuffer(CACHE_KEY, buf.get(), buf.Length() + 1);
+
+        mCache->PutBuffer(CACHE_KEY,
+            UniquePtr<char[]>(ToNewCString(buf)), buf.Length() + 1);
     }
 
     // This may be called more than once (if we re-load the font list).
     void Init()
     {
         if (!mCache) {
             return;
         }
@@ -1563,13 +1566,17 @@ gfxFT2FontList::CreateFontFamily(const n
 }
 
 void
 gfxFT2FontList::WillShutdown()
 {
     mozilla::scache::StartupCache* cache =
         mozilla::scache::StartupCache::GetSingleton();
     if (cache && mJarModifiedTime > 0) {
+        const size_t bufSize = sizeof(mJarModifiedTime);
+        auto buf = MakeUnique<char[]>(bufSize);
+        memcpy(buf.get(), &mJarModifiedTime, bufSize);
+
         cache->PutBuffer(JAR_LAST_MODIFED_TIME,
-                         (char*)&mJarModifiedTime, sizeof(mJarModifiedTime));
+                         Move(buf), bufSize);
     }
     mFontNameCache = nullptr;
 }
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -365,25 +365,27 @@ pub enum WrFilterOpType {
   Contrast = 2,
   Grayscale = 3,
   HueRotate = 4,
   Invert = 5,
   Opacity = 6,
   Saturate = 7,
   Sepia = 8,
   DropShadow = 9,
+  ColorMatrix = 10,
 }
 
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct WrFilterOp {
     filter_type: WrFilterOpType,
     argument: c_float, // holds radius for DropShadow; value for other filters
     offset: LayoutVector2D, // only used for DropShadow
     color: ColorF, // only used for DropShadow
+    matrix: [f32;20], // only used in ColorMatrix
 }
 
 /// cbindgen:derive-eq=false
 #[repr(C)]
 #[derive(Debug)]
 pub struct WrTransformProperty {
     pub id: u64,
     pub transform: LayoutTransform,
@@ -1419,16 +1421,17 @@ pub extern "C" fn wr_dp_push_stacking_co
             WrFilterOpType::HueRotate => FilterOp::HueRotate(c_filter.argument),
             WrFilterOpType::Invert => FilterOp::Invert(c_filter.argument),
             WrFilterOpType::Opacity => FilterOp::Opacity(PropertyBinding::Value(c_filter.argument), c_filter.argument),
             WrFilterOpType::Saturate => FilterOp::Saturate(c_filter.argument),
             WrFilterOpType::Sepia => FilterOp::Sepia(c_filter.argument),
             WrFilterOpType::DropShadow => FilterOp::DropShadow(c_filter.offset,
                                                                c_filter.argument,
                                                                c_filter.color),
+            WrFilterOpType::ColorMatrix => FilterOp::ColorMatrix(c_filter.matrix),
         }
     }).collect();
 
     let opacity_ref = unsafe { opacity.as_ref() };
     if let Some(opacity) = opacity_ref {
         if *opacity < 1.0 {
             filters.push(FilterOp::Opacity(PropertyBinding::Value(*opacity), *opacity));
         }
--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -1,13 +1,13 @@
 /* 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/. */
 
-/* Generated with cbindgen:0.4.4 */
+/* Generated with cbindgen:0.5.0 */
 
 /* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
  * To generate this file:
  *   1. Get the latest cbindgen using `cargo +nightly install --force cbindgen`
  *      a. Alternatively, you can clone `https://github.com/eqrion/cbindgen` and use a tagged release
  *   2. Run `rustup run nightly cbindgen toolkit/library/rust/ --crate webrender_bindings -o gfx/webrender_bindings/webrender_ffi_generated.h`
  */
 
@@ -218,16 +218,17 @@ enum class WrFilterOpType : uint32_t {
   Contrast = 2,
   Grayscale = 3,
   HueRotate = 4,
   Invert = 5,
   Opacity = 6,
   Saturate = 7,
   Sepia = 8,
   DropShadow = 9,
+  ColorMatrix = 10,
 
   Sentinel /* this must be last for serialization purposes. */
 };
 
 enum class YuvColorSpace : uint32_t {
   Rec601 = 0,
   Rec709 = 1,
 
@@ -671,23 +672,17 @@ struct TypedTransform3D {
 
 using LayoutTransform = TypedTransform3D<float, LayoutPixel, LayoutPixel>;
 
 struct WrFilterOp {
   WrFilterOpType filter_type;
   float argument;
   LayoutVector2D offset;
   ColorF color;
-
-  bool operator==(const WrFilterOp& aOther) const {
-    return filter_type == aOther.filter_type &&
-           argument == aOther.argument &&
-           offset == aOther.offset &&
-           color == aOther.color;
-  }
+  float matrix[20];
 };
 
 struct FontInstanceKey {
   IdNamespace mNamespace;
   uint32_t mHandle;
 
   bool operator==(const FontInstanceKey& aOther) const {
     return mNamespace == aOther.mNamespace &&
--- a/ipc/contentproc/plugin-container.cpp
+++ b/ipc/contentproc/plugin-container.cpp
@@ -6,20 +6,17 @@
 
 #include "nsXPCOM.h"
 #include "nsXULAppAPI.h"
 #include "mozilla/Bootstrap.h"
 
 #ifdef XP_WIN
 #include <windows.h>
 // we want a wmain entry point
-// but we don't want its DLL load protection, because we'll handle it here
-#define XRE_DONT_PROTECT_DLL_LOAD
 #include "nsWindowsWMain.cpp"
-#include "nsSetDllDirectory.h"
 #else
 // FIXME/cjones testing
 #include <unistd.h>
 #endif
 
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
 #include "mozilla/sandboxing/SandboxInitialization.h"
 #include "mozilla/sandboxing/sandboxLogging.h"
@@ -45,21 +42,11 @@ content_process_main(mozilla::Bootstrap*
         }
 
         childData.ProvideLogFunction = mozilla::sandboxing::ProvideLogFunction;
     }
 #endif
 
     bootstrap->XRE_SetProcessType(argv[--argc]);
 
-#ifdef XP_WIN
-    // For plugins, this is done in PluginProcessChild::Init, as we need to
-    // avoid it for unsupported plugins.  See PluginProcessChild::Init for
-    // the details.
-    if (bootstrap->XRE_GetProcessType() != GeckoProcessType_Plugin) {
-        mozilla::SanitizeEnvironmentVariables();
-        SetDllDirectoryW(L"");
-    }
-#endif
-
     nsresult rv = bootstrap->XRE_InitChildProcess(argc, argv, &childData);
     return NS_FAILED(rv);
 }
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -22,26 +22,29 @@
 #include "builtin/Promise.h"
 #include "builtin/SelfHostingDefines.h"
 #ifdef DEBUG
 #include "frontend/TokenStream.h"
 #include "irregexp/RegExpAST.h"
 #include "irregexp/RegExpEngine.h"
 #include "irregexp/RegExpParser.h"
 #endif
+#include "jit/BaselineJIT.h"
 #include "jit/InlinableNatives.h"
 #include "js/Debug.h"
 #include "js/HashTable.h"
 #include "js/StructuredClone.h"
 #include "js/UbiNode.h"
 #include "js/UbiNodeBreadthFirst.h"
 #include "js/UbiNodeShortestPaths.h"
 #include "js/UniquePtr.h"
 #include "js/Vector.h"
 #include "js/Wrapper.h"
+#include "vm/AsyncFunction.h"
+#include "vm/AsyncIteration.h"
 #include "vm/Debugger.h"
 #include "vm/GlobalObject.h"
 #include "vm/Interpreter.h"
 #include "vm/Iteration.h"
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
 #include "vm/ProxyObject.h"
 #include "vm/SavedStacks.h"
@@ -274,16 +277,27 @@ GetBuildConfiguration(JSContext* cx, uns
     if (!JS_SetProperty(cx, info, "pointer-byte-size", value))
         return false;
 
     args.rval().setObject(*info);
     return true;
 }
 
 static bool
+ReturnStringCopy(JSContext* cx, CallArgs& args, const char* message)
+{
+    JSString* str = JS_NewStringCopyZ(cx, message);
+    if (!str)
+        return false;
+
+    args.rval().setString(str);
+    return true;
+}
+
+static bool
 GC(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
     /*
      * If the first argument is 'zone', we collect any zones previously
      * scheduled for GC via schedulegc. If the first argument is an object, we
      * collect the object's zone (and any other zones scheduled for
@@ -322,21 +336,17 @@ GC(JSContext* cx, unsigned argc, Value* 
     JSGCInvocationKind gckind = shrinking ? GC_SHRINK : GC_NORMAL;
     JS::GCForReason(cx, gckind, JS::gcreason::API);
 
     char buf[256] = { '\0' };
 #ifndef JS_MORE_DETERMINISTIC
     SprintfLiteral(buf, "before %zu, after %zu\n",
                    preBytes, cx->runtime()->gc.usage.gcBytes());
 #endif
-    JSString* str = JS_NewStringCopyZ(cx, buf);
-    if (!str)
-        return false;
-    args.rval().setString(str);
-    return true;
+    return ReturnStringCopy(cx, args, buf);
 }
 
 static bool
 MinorGC(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.get(0) == BooleanValue(true))
         cx->zone()->group()->storeBuffer().setAboutToOverflow(JS::gcreason::FULL_GENERIC_BUFFER);
@@ -981,21 +991,17 @@ GCState(JSContext* cx, unsigned argc, Va
 
     if (args.length() != 0) {
         RootedObject callee(cx, &args.callee());
         ReportUsageErrorASCII(cx, callee, "Too many arguments");
         return false;
     }
 
     const char* state = StateName(cx->runtime()->gc.state());
-    JSString* str = JS_NewStringCopyZ(cx, state);
-    if (!str)
-        return false;
-    args.rval().setString(str);
-    return true;
+    return ReturnStringCopy(cx, args, state);
 }
 
 static bool
 DeterministicGC(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (args.length() != 1) {
@@ -2502,52 +2508,34 @@ testingFunc_bailAfter(JSContext* cx, uns
     return true;
 }
 
 static bool
 testingFunc_inJit(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (!jit::IsBaselineEnabled(cx)) {
-        JSString* error = JS_NewStringCopyZ(cx, "Baseline is disabled.");
-        if(!error)
-            return false;
-
-        args.rval().setString(error);
-        return true;
-    }
+    if (!jit::IsBaselineEnabled(cx))
+        return ReturnStringCopy(cx, args, "Baseline is disabled.");
 
     JSScript* script = cx->currentScript();
-    if (script && script->getWarmUpResetCount() >= 20) {
-        JSString* error = JS_NewStringCopyZ(cx, "Compilation is being repeatedly prevented. Giving up.");
-        if (!error)
-            return false;
-
-        args.rval().setString(error);
-        return true;
-    }
+    if (script && script->getWarmUpResetCount() >= 20)
+        return ReturnStringCopy(cx, args, "Compilation is being repeatedly prevented. Giving up.");
 
     args.rval().setBoolean(cx->currentlyRunningInJit());
     return true;
 }
 
 static bool
 testingFunc_inIon(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
-    if (!jit::IsIonEnabled(cx)) {
-        JSString* error = JS_NewStringCopyZ(cx, "Ion is disabled.");
-        if (!error)
-            return false;
-
-        args.rval().setString(error);
-        return true;
-    }
+    if (!jit::IsIonEnabled(cx))
+        return ReturnStringCopy(cx, args, "Ion is disabled.");
 
     if (cx->activation()->hasWasmExitFP()) {
         // Exited through wasm. Note this is false when the fast wasm->jit exit
         // was taken, in which case we actually have jit frames on the stack.
         args.rval().setBoolean(false);
         return true;
     }
 
@@ -2555,24 +2543,18 @@ testingFunc_inIon(JSContext* cx, unsigne
     if (!iter.done() && iter.isIon()) {
         // Reset the counter of the IonScript's script.
         jit::JSJitFrameIter jitIter(cx->activation()->asJit());
         ++jitIter;
         jitIter.script()->resetWarmUpResetCounter();
     } else {
         // Check if we missed multiple attempts at compiling the innermost script.
         JSScript* script = cx->currentScript();
-        if (script && script->getWarmUpResetCount() >= 20) {
-            JSString* error = JS_NewStringCopyZ(cx, "Compilation is being repeatedly prevented. Giving up.");
-            if (!error)
-                return false;
-
-            args.rval().setString(error);
-            return true;
-        }
+        if (script && script->getWarmUpResetCount() >= 20)
+            return ReturnStringCopy(cx, args, "Compilation is being repeatedly prevented. Giving up.");
     }
 
     args.rval().setBoolean(!iter.done() && iter.isIon());
     return true;
 }
 
 bool
 js::testingFunc_assertFloat32(JSContext* cx, unsigned argc, Value* vp)
@@ -3224,29 +3206,24 @@ ObjectAddress(JSContext* cx, unsigned ar
     if (!args[0].isObject()) {
         RootedObject callee(cx, &args.callee());
         ReportUsageErrorASCII(cx, callee, "Expected object");
         return false;
     }
 
 #ifdef JS_MORE_DETERMINISTIC
     args.rval().setInt32(0);
+    return true;
 #else
     void* ptr = js::UncheckedUnwrap(&args[0].toObject(), true);
     char buffer[64];
     SprintfLiteral(buffer, "%p", ptr);
 
-    JSString* str = JS_NewStringCopyZ(cx, buffer);
-    if (!str)
-        return false;
-
-    args.rval().setString(str);
+    return ReturnStringCopy(cx, args, buffer);
 #endif
-
-    return true;
 }
 
 static bool
 SharedAddress(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() != 1) {
         RootedObject callee(cx, &args.callee());
@@ -3329,22 +3306,17 @@ GetBacktrace(JSContext* cx, unsigned arg
             return false;
         showThisProps = ToBoolean(v);
     }
 
     JS::UniqueChars buf = JS::FormatStackDump(cx, nullptr, showArgs, showLocals, showThisProps);
     if (!buf)
         return false;
 
-    RootedString str(cx);
-    if (!(str = JS_NewStringCopyZ(cx, buf.get())))
-        return false;
-
-    args.rval().setString(str);
-    return true;
+    return ReturnStringCopy(cx, args, buf.get());
 }
 
 static bool
 ReportOutOfMemory(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     JS_ReportOutOfMemory(cx);
     cx->clearPendingException();
@@ -4824,23 +4796,18 @@ GetTimeZone(JSContext* cx, unsigned argc
 #endif /* HAVE_TM_ZONE_TM_GMTOFF */
         }
 #endif /* _WIN32 */
         return nullptr;
     };
 
     std::time_t now = std::time(nullptr);
     if (now != static_cast<std::time_t>(-1)) {
-        if (const char* tz = getTimeZone(&now)) {
-            JSString* str = JS_NewStringCopyZ(cx, tz);
-            if (!str)
-                return false;
-            args.rval().setString(str);
-            return true;
-        }
+        if (const char* tz = getTimeZone(&now))
+            return ReturnStringCopy(cx, args, tz);
     }
 
     args.rval().setUndefined();
     return true;
 }
 
 static bool
 SetTimeZone(JSContext* cx, unsigned argc, Value* vp)
@@ -4988,16 +4955,139 @@ static bool
 DisableExpressionClosures(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     JS::ContextOptionsRef(cx).setExpressionClosures(false);
     args.rval().setUndefined();
     return true;
 }
 
+JSScript*
+js::TestingFunctionArgumentToScript(JSContext* cx,
+                                    HandleValue v,
+                                    JSFunction** funp /* = nullptr */)
+{
+    if (v.isString()) {
+        // To convert a string to a script, compile it. Parse it as an ES6 Program.
+        RootedLinearString linearStr(cx, StringToLinearString(cx, v.toString()));
+        if (!linearStr)
+            return nullptr;
+        size_t len = GetLinearStringLength(linearStr);
+        AutoStableStringChars linearChars(cx);
+        if (!linearChars.initTwoByte(cx, linearStr))
+            return nullptr;
+        const char16_t* chars = linearChars.twoByteRange().begin().get();
+
+        RootedScript script(cx);
+        CompileOptions options(cx);
+        if (!JS::Compile(cx, options, chars, len, &script))
+            return nullptr;
+        return script;
+    }
+
+    RootedFunction fun(cx, JS_ValueToFunction(cx, v));
+    if (!fun)
+        return nullptr;
+
+    // Unwrap bound functions.
+    while (fun->isBoundFunction()) {
+        JSObject* target = fun->getBoundFunctionTarget();
+        if (target && target->is<JSFunction>())
+            fun = &target->as<JSFunction>();
+        else
+            break;
+    }
+
+    // Get unwrapped async function.
+    if (IsWrappedAsyncFunction(fun))
+        fun = GetUnwrappedAsyncFunction(fun);
+    if (IsWrappedAsyncGenerator(fun))
+        fun = GetUnwrappedAsyncGenerator(fun);
+
+    if (!fun->isInterpreted()) {
+        JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_TESTING_SCRIPTS_ONLY);
+        return nullptr;
+    }
+
+    JSScript* script = JSFunction::getOrCreateScript(cx, fun);
+    if (!script)
+        return nullptr;
+
+    if (funp)
+        *funp = fun;
+
+    return script;
+}
+
+static bool
+BaselineCompile(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    RootedObject callee(cx, &args.callee());
+
+    RootedScript script(cx);
+    if (args.length() == 0) {
+        NonBuiltinScriptFrameIter iter(cx);
+        if (iter.done()) {
+            ReportUsageErrorASCII(cx, callee, "no script argument and no script caller");
+            return false;
+        }
+        script = iter.script();
+    } else {
+        script = TestingFunctionArgumentToScript(cx, args[0]);
+        if (!script)
+            return false;
+    }
+
+    bool forceDebug = false;
+    if (args.length() > 1) {
+        if (args.length() > 2) {
+            ReportUsageErrorASCII(cx, callee, "too many arguments");
+            return false;
+        }
+        if (!args[1].isBoolean() && !args[1].isUndefined()) {
+            ReportUsageErrorASCII(cx, callee, "forceDebugInstrumentation argument should be boolean");
+            return false;
+        }
+        forceDebug = ToBoolean(args[1]);
+    }
+
+    if (script->hasBaselineScript()) {
+        if (forceDebug && !script->baselineScript()->hasDebugInstrumentation()) {
+            // There isn't an easy way to do this for a script that might be on
+            // stack right now. See js::jit::RecompileOnStackBaselineScriptsForDebugMode.
+            ReportUsageErrorASCII(cx, callee,
+                                  "unsupported case: recompiling script for debug mode");
+            return false;
+        }
+
+        args.rval().setUndefined();
+        return true;
+    }
+
+    if (!jit::IsBaselineEnabled(cx))
+        return ReturnStringCopy(cx, args, "baseline disabled");
+    if (!script->canBaselineCompile())
+        return ReturnStringCopy(cx, args, "can't compile");
+
+    jit::MethodStatus status = jit::BaselineCompile(cx, script, forceDebug);
+    switch (status) {
+      case jit::Method_Error:
+        return false;
+      case jit::Method_CantCompile:
+        return ReturnStringCopy(cx, args, "can't compile");
+      case jit::Method_Skipped:
+        return ReturnStringCopy(cx, args, "skipped");
+      case jit::Method_Compiled:
+        args.rval().setUndefined();
+    }
+
+    return true;
+}
+
 static const JSFunctionSpecWithHelp TestingFunctions[] = {
     JS_FN_HELP("gc", ::GC, 0, 0,
 "gc([obj] | 'zone' [, 'shrinking'])",
 "  Run the garbage collector. When obj is given, GC only its zone.\n"
 "  If 'zone' is given, GC any zones that were scheduled for\n"
 "  GC via schedulegc.\n"
 "  If 'shrinking' is passed as the optional second argument, perform a\n"
 "  shrinking GC rather than a normal GC."),
@@ -5617,16 +5707,25 @@ gc::ZealModeHelpText),
     JS_FN_HELP("enableExpressionClosures", EnableExpressionClosures, 0, 0,
 "enableExpressionClosures()",
 "  Enables the deprecated, non-standard expression closures.\n"),
 
     JS_FN_HELP("disableExpressionClosures", DisableExpressionClosures, 0, 0,
 "disableExpressionClosures()",
 "  Disables the deprecated, non-standard expression closures.\n"),
 
+    JS_FN_HELP("baselineCompile", BaselineCompile, 2, 0,
+"baselineCompile([fun/code], forceDebugInstrumentation=false)",
+"  Baseline-compiles the given JS function or script.\n"
+"  Without arguments, baseline-compiles the caller's script; but note\n"
+"  that extra boilerplate is needed afterwards to cause the VM to start\n"
+"  running the jitcode rather than staying in the interpreter:\n"
+"    baselineCompile();  for (var i=0; i<1; i++) {} ...\n"
+"  The interpreter will enter the new jitcode at the loop header.\n"),
+
     JS_FS_HELP_END
 };
 
 static const JSFunctionSpecWithHelp FuzzingUnsafeTestingFunctions[] = {
 #ifdef DEBUG
     JS_FN_HELP("parseRegExp", ParseRegExp, 3, 0,
 "parseRegExp(pattern[, flags[, match_only])",
 "  Parses a RegExp pattern and returns a tree, potentially throwing."),
--- a/js/src/builtin/TestingFunctions.h
+++ b/js/src/builtin/TestingFunctions.h
@@ -15,11 +15,14 @@ MOZ_MUST_USE bool
 DefineTestingFunctions(JSContext* cx, HandleObject obj, bool fuzzingSafe, bool disableOOMFunctions);
 
 MOZ_MUST_USE bool
 testingFunc_assertFloat32(JSContext* cx, unsigned argc, Value* vp);
 
 MOZ_MUST_USE bool
 testingFunc_assertRecoveredOnBailout(JSContext* cx, unsigned argc, Value* vp);
 
+extern JSScript*
+TestingFunctionArgumentToScript(JSContext* cx, HandleValue v, JSFunction** funp = nullptr);
+
 } /* namespace js */
 
 #endif /* builtin_TestingFunctions_h */
--- a/js/src/gc/Allocator.cpp
+++ b/js/src/gc/Allocator.cpp
@@ -177,17 +177,21 @@ js::AllocateString(JSContext* cx, Initia
             ReportOutOfMemory(cx);
         return str;
     }
 
     JSRuntime* rt = cx->runtime();
     if (!rt->gc.checkAllocatorState<allowGC>(cx, kind))
         return nullptr;
 
-    if (cx->nursery().isEnabled() && heap != TenuredHeap && cx->nursery().canAllocateStrings()) {
+    if (cx->nursery().isEnabled() &&
+        heap != TenuredHeap &&
+        cx->nursery().canAllocateStrings() &&
+        cx->zone()->allocNurseryStrings)
+    {
         auto str = static_cast<StringAllocT*>(rt->gc.tryNewNurseryString<allowGC>(cx, size, kind));
         if (str)
             return str;
 
         // Our most common non-jit allocation path is NoGC; thus, if we fail the
         // alloc and cannot GC, we *must* return nullptr here so that the caller
         // will do a CanGC allocation to clear the nursery. Failing to do so will
         // cause all allocations on this path to land in Tenured, and we will not
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -118,28 +118,28 @@ js::Nursery::Nursery(JSRuntime* rt)
   , currentStringEnd_(0)
   , currentChunk_(0)
   , maxChunkCount_(0)
   , chunkCountLimit_(0)
   , timeInChunkAlloc_(0)
   , previousPromotionRate_(0)
   , profileThreshold_(0)
   , enableProfiling_(false)
-  , canAllocateStrings_(false)
+  , canAllocateStrings_(true)
   , reportTenurings_(0)
   , minorGCTriggerReason_(JS::gcreason::NO_REASON)
   , minorGcCount_(0)
   , freeMallocedBuffersTask(nullptr)
 #ifdef JS_GC_ZEAL
   , lastCanary_(nullptr)
 #endif
 {
-    const char* env = getenv("MOZ_ENABLE_NURSERY_STRINGS");
+    const char* env = getenv("MOZ_DISABLE_NURSERY_STRINGS");
     if (env && *env)
-        canAllocateStrings_ = true;
+        canAllocateStrings_ = false;
 }
 
 bool
 js::Nursery::init(uint32_t maxNurseryBytes, AutoLockGCBgAlloc& lock)
 {
     if (!mallocedBuffers.init())
         return false;
 
@@ -733,31 +733,50 @@ js::Nursery::collect(JS::gcreason::Reaso
     // If we are promoting the nursery, or exhausted the store buffer with
     // pointers to nursery things, which will force a collection well before
     // the nursery is full, look for object groups that are getting promoted
     // excessively and try to pretenure them.
     startProfile(ProfileKey::Pretenure);
     bool validPromotionRate;
     const float promotionRate = calcPromotionRate(&validPromotionRate);
     uint32_t pretenureCount = 0;
-    if (validPromotionRate) {
-        if (promotionRate > 0.8 || IsFullStoreBufferReason(reason)) {
-            JSContext* cx = TlsContext.get();
-            for (auto& entry : tenureCounts.entries) {
-                if (entry.count >= 3000) {
-                    ObjectGroup* group = entry.group;
-                    if (group->canPreTenure() && group->zone()->group()->canEnterWithoutYielding(cx)) {
-                        AutoCompartment ac(cx, group);
-                        group->setShouldPreTenure(cx);
-                        pretenureCount++;
-                    }
+    bool shouldPretenure = (validPromotionRate && promotionRate > 0.6) ||
+        IsFullStoreBufferReason(reason);
+
+    if (shouldPretenure) {
+        JSContext* cx = TlsContext.get();
+        for (auto& entry : tenureCounts.entries) {
+            if (entry.count >= 3000) {
+                ObjectGroup* group = entry.group;
+                if (group->canPreTenure() && group->zone()->group()->canEnterWithoutYielding(cx)) {
+                    AutoCompartment ac(cx, group);
+                    group->setShouldPreTenure(cx);
+                    pretenureCount++;
                 }
             }
         }
     }
+    for (ZonesIter zone(rt, SkipAtoms); !zone.done(); zone.next()) {
+        if (shouldPretenure && zone->allocNurseryStrings && zone->tenuredStrings >= 30 * 1000) {
+            JSRuntime::AutoProhibitActiveContextChange apacc(rt);
+            CancelOffThreadIonCompile(zone);
+            bool preserving = zone->isPreservingCode();
+            zone->setPreservingCode(false);
+            zone->discardJitCode(rt->defaultFreeOp());
+            zone->setPreservingCode(preserving);
+            for (CompartmentsInZoneIter c(zone); !c.done(); c.next()) {
+                if (jit::JitCompartment* jitComp = c->jitCompartment()) {
+                    jitComp->discardStubs();
+                    jitComp->stringsCanBeInNursery = false;
+                }
+            }
+            zone->allocNurseryStrings = false;
+        }
+        zone->tenuredStrings = 0;
+    }
     endProfile(ProfileKey::Pretenure);
 
     // We ignore gcMaxBytes when allocating for minor collection. However, if we
     // overflowed, we disable the nursery. The next time we allocate, we'll fail
     // because gcBytes >= gcMaxBytes.
     if (rt->gc.usage.gcBytes() >= rt->gc.tunables.gcMaxBytes())
         disable();
     // Disable the nursery if the user changed the configuration setting.  The
@@ -1081,17 +1100,17 @@ js::Nursery::setStartPosition()
 {
     currentStartChunk_ = currentChunk_;
     currentStartPosition_ = position();
 }
 
 void
 js::Nursery::maybeResizeNursery(JS::gcreason::Reason reason)
 {
-    static const double GrowThreshold   = 0.05;
+    static const double GrowThreshold   = 0.03;
     static const double ShrinkThreshold = 0.01;
     unsigned newMaxNurseryChunks;
 
     // Shrink the nursery to its minimum size of we ran out of memory or
     // received a memory pressure event.
     if (gc::IsOOMReason(reason)) {
         minimizeAllocableSpace();
         return;
--- a/js/src/gc/Zone.cpp
+++ b/js/src/gc/Zone.cpp
@@ -41,16 +41,18 @@ JS::Zone::Zone(JSRuntime* rt, ZoneGroup*
     regExps(this),
     markedAtoms_(group),
     atomCache_(group),
     externalStringCache_(group),
     functionToStringCache_(group),
     usage(&rt->gc.usage),
     threshold(),
     gcDelayBytes(0),
+    tenuredStrings(group, 0),
+    allocNurseryStrings(group, true),
     propertyTree_(group, this),
     baseShapes_(group, this),
     initialShapes_(group, this),
     nurseryShapes_(group),
     data(group, nullptr),
     isSystem(group, false),
 #ifdef DEBUG
     gcLastSweepGroupIndex(group, 0),
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -477,16 +477,19 @@ struct Zone : public JS::shadow::Zone,
 
     // Thresholds used to trigger GC.
     js::gc::ZoneHeapThreshold threshold;
 
     // Amount of data to allocate before triggering a new incremental slice for
     // the current GC.
     js::UnprotectedData<size_t> gcDelayBytes;
 
+    js::ZoneGroupData<uint32_t> tenuredStrings;
+    js::ZoneGroupData<bool> allocNurseryStrings;
+
   private:
     // Shared Shape property tree.
     js::ZoneGroupData<js::PropertyTree> propertyTree_;
   public:
     js::PropertyTree& propertyTree() { return propertyTree_.ref(); }
 
   private:
     // Set of all unowned base shapes in the Zone.
--- a/js/src/jit-test/tests/basic/testTypedArrayInit.js
+++ b/js/src/jit-test/tests/basic/testTypedArrayInit.js
@@ -8,18 +8,20 @@ function f() {
                      Uint16Array,
                      Int32Array,
                      Uint32Array,
                      Float32Array,
                      Float64Array ])
   {
     for (var len of [ 3, 30, 300, 3000, 30000 ]) {
       var arr = new ctor(len);
-      for (var i = 0; i < arr.length; i++)
-        assertEq(arr[i], 0, "index " + i + " of " + ctor.name + " len " + len);
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] != 0)
+          assertEq(arr[i], 0, "index " + i + " of " + ctor.name + " len " + len);
+      }
     }
   }
 }
 
 f();
 f();
 gc()
 f();
new file mode 100644
--- /dev/null
+++ b/js/src/jit-test/tests/self-test/baselineCompile.js
@@ -0,0 +1,20 @@
+// Check that the help text for baselineCompile() is accurate.
+
+if (typeof inJit == "function" && typeof baselineCompile == "function") {
+    if (!inJit()) {
+
+        baselineCompile();  // compile the current script
+
+        assertEq(inJit(), false,
+                 "We have compiled this script to baseline jitcode, but shouldn't " +
+                 "be running it yet, according to the help text for baselineCompile() " +
+                 "in TestingFunctions.cpp. If you fail this assertion, nice work, and " +
+                 "please update the help text!");
+
+        for (var i=0; i<1; i++) {}  // exact boilerplate suggested by the help text
+
+        assertEq(inJit(), true,
+                 "help text in TestingFunctions.cpp claims the above loop causes " +
+                 "the interpreter to start running the new baseline jitcode");
+    }
+}
--- a/js/src/jit/CompileWrappers.cpp
+++ b/js/src/jit/CompileWrappers.cpp
@@ -200,17 +200,19 @@ const void*
 CompileZone::addressOfStringNurseryCurrentEnd()
 {
     return zone()->runtimeFromAnyThread()->gc.addressOfStringNurseryCurrentEnd();
 }
 
 bool
 CompileZone::canNurseryAllocateStrings()
 {
-    return nurseryExists() && zone()->group()->nursery().canAllocateStrings();
+    return nurseryExists() &&
+        zone()->group()->nursery().canAllocateStrings() &&
+        zone()->allocNurseryStrings;
 }
 
 bool
 CompileZone::nurseryExists()
 {
     return zone()->group()->nursery().exists();
 }
 
--- a/js/src/jit/JitCompartment.h
+++ b/js/src/jit/JitCompartment.h
@@ -605,16 +605,23 @@ class JitCompartment
     MOZ_MUST_USE bool ensureIonStubsExist(JSContext* cx);
 
     void sweep(FreeOp* fop, JSCompartment* compartment);
 
     JitCode* stringConcatStubNoBarrier() const {
         return stringConcatStub_;
     }
 
+    void discardStubs() {
+        stringConcatStub_ = nullptr;
+        regExpMatcherStub_ = nullptr;
+        regExpSearcherStub_ = nullptr;
+        regExpTesterStub_ = nullptr;
+    }
+
     JitCode* regExpMatcherStubNoBarrier() const {
         return regExpMatcherStub_;
     }
 
     MOZ_MUST_USE bool ensureRegExpMatcherStubExists(JSContext* cx) {
         if (regExpMatcherStub_)
             return true;
         regExpMatcherStub_ = generateRegExpMatcherStub(cx);
--- a/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
+++ b/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
@@ -106,16 +106,34 @@ CodeGeneratorMIPSShared::branchToBlock(A
     } else {
         if (fmt == Assembler::DoubleFloat)
             masm.branchDouble(cond, lhs, rhs, mir->lir()->label());
         else
             masm.branchFloat(cond, lhs, rhs, mir->lir()->label());
     }
 }
 
+FrameSizeClass
+FrameSizeClass::FromDepth(uint32_t frameDepth)
+{
+    return FrameSizeClass::None();
+}
+
+FrameSizeClass
+FrameSizeClass::ClassLimit()
+{
+    return FrameSizeClass(0);
+}
+
+uint32_t
+FrameSizeClass::frameSize() const
+{
+    MOZ_CRASH("MIPS does not use frame size classes");
+}
+
 void
 OutOfLineBailout::accept(CodeGeneratorMIPSShared* codegen)
 {
     codegen->visitOutOfLineBailout(this);
 }
 
 void
 CodeGeneratorMIPSShared::visitTestIAndBranch(LTestIAndBranch* test)
@@ -1502,16 +1520,27 @@ CodeGeneratorMIPSShared::visitWasmTrunca
     else if (fromType == MIRType::Float32)
         masm.wasmTruncateFloat32ToInt32(input, output, mir->isSaturating(), oolEntry);
     else
         MOZ_CRASH("unexpected type");
 
     masm.bind(ool->rejoin());
 }
 
+
+void
+CodeGeneratorMIPSShared::visitOutOfLineBailout(OutOfLineBailout* ool)
+{
+    // Push snapshotOffset and make sure stack is aligned.
+    masm.subPtr(Imm32(sizeof(Value)), StackPointer);
+    masm.storePtr(ImmWord(ool->snapshot()->snapshotOffset()), Address(StackPointer, 0));
+
+    masm.jump(&deoptLabel_);
+}
+
 void
 CodeGeneratorMIPSShared::visitOutOfLineWasmTruncateCheck(OutOfLineWasmTruncateCheck* ool)
 {
     if(ool->toType() == MIRType::Int32)
     {
         masm.outOfLineWasmTruncateToInt32Check(ool->input(), ool->output(), ool->fromType(),
                                                ool->flags(), ool->rejoin(), ool->bytecodeOffset());
     } else {
@@ -1558,17 +1587,17 @@ CodeGeneratorMIPSShared::visitCopySignD(
     masm.ma_ins(rhsi, lhsi, 0, 31);
 
     masm.moveToDoubleHi(rhsi, output);
 }
 
 void
 CodeGeneratorMIPSShared::visitValue(LValue* value)
 {
-    const ValueOperand out = ToOutValue(value);
+    const ValueOperand out = GetValueOutput(value);
 
     masm.moveValue(value->value(), out);
 }
 
 void
 CodeGeneratorMIPSShared::visitDouble(LDouble* ins)
 {
     const LDefinition* out = ins->getDef(0);
--- a/js/src/jit/mips-shared/CodeGenerator-mips-shared.h
+++ b/js/src/jit/mips-shared/CodeGenerator-mips-shared.h
@@ -7,19 +7,22 @@
 #ifndef jit_mips_shared_CodeGenerator_mips_shared_h
 #define jit_mips_shared_CodeGenerator_mips_shared_h
 
 #include "jit/shared/CodeGenerator-shared.h"
 
 namespace js {
 namespace jit {
 
+class CodeGeneratorMIPSShared;
 class OutOfLineBailout;
 class OutOfLineTableSwitch;
 
+using OutOfLineWasmTruncateCheck = OutOfLineWasmTruncateCheckBase<CodeGeneratorMIPSShared>;
+
 class CodeGeneratorMIPSShared : public CodeGeneratorShared
 {
     friend class MoveResolverMIPS;
 
     CodeGeneratorMIPSShared* thisFromCtor() {
         return this;
     }
 
@@ -184,24 +187,21 @@ class CodeGeneratorMIPSShared : public C
     void visitRound(LRound* lir);
     void visitRoundF(LRoundF* lir);
     void visitTruncateDToInt32(LTruncateDToInt32* ins);
     void visitTruncateFToInt32(LTruncateFToInt32* ins);
 
     void visitWasmTruncateToInt32(LWasmTruncateToInt32* lir);
 
     // Out of line visitors.
-    virtual void visitOutOfLineBailout(OutOfLineBailout* ool) = 0;
+    void visitOutOfLineBailout(OutOfLineBailout* ool);
     void visitOutOfLineWasmTruncateCheck(OutOfLineWasmTruncateCheck* ool);
     void visitCopySignD(LCopySignD* ins);
     void visitCopySignF(LCopySignF* ins);
 
-  protected:
-    virtual ValueOperand ToOutValue(LInstruction* ins) = 0;
-
   public:
     CodeGeneratorMIPSShared(MIRGenerator* gen, LIRGraph* graph, MacroAssembler* masm);
 
     void visitValue(LValue* value);
     void visitDouble(LDouble* ins);
     void visitFloat32(LFloat32* ins);
 
     void visitGuardShape(LGuardShape* guard);
--- a/js/src/jit/mips32/CodeGenerator-mips32.cpp
+++ b/js/src/jit/mips32/CodeGenerator-mips32.cpp
@@ -43,26 +43,16 @@ class js::jit::OutOfLineTableSwitch : pu
     }
 
     CodeLabel* jumpLabel() {
         return &jumpLabel_;
     }
 };
 
 void
-CodeGeneratorMIPS::visitOutOfLineBailout(OutOfLineBailout* ool)
-{
-    // Push snapshotOffset and make sure stack is aligned.
-    masm.subPtr(Imm32(2 * sizeof(void*)), StackPointer);
-    masm.storePtr(ImmWord(ool->snapshot()->snapshotOffset()), Address(StackPointer, 0));
-
-    masm.jump(&deoptLabel_);
-}
-
-void
 CodeGeneratorMIPS::visitOutOfLineTableSwitch(OutOfLineTableSwitch* ool)
 {
     MTableSwitch* mir = ool->mir();
 
     masm.haltingAlign(sizeof(void*));
     masm.bind(ool->jumpLabel()->target());
     masm.addCodeLabel(*ool->jumpLabel());
 
@@ -104,43 +94,16 @@ CodeGeneratorMIPS::emitTableSwitchDispat
     // Compute the position where a pointer to the right case stands.
     masm.ma_li(address, ool->jumpLabel()->patchAt());
     masm.lshiftPtr(Imm32(4), index);
     masm.addPtr(index, address);
 
     masm.branch(address);
 }
 
-static const uint32_t FrameSizes[] = { 128, 256, 512, 1024 };
-
-FrameSizeClass
-FrameSizeClass::FromDepth(uint32_t frameDepth)
-{
-    for (uint32_t i = 0; i < mozilla::ArrayLength(FrameSizes); i++) {
-        if (frameDepth < FrameSizes[i])
-            return FrameSizeClass(i);
-    }
-
-    return FrameSizeClass::None();
-}
-
-FrameSizeClass
-FrameSizeClass::ClassLimit()
-{
-    return FrameSizeClass(mozilla::ArrayLength(FrameSizes));
-}
-
-uint32_t
-FrameSizeClass::frameSize() const
-{
-    MOZ_ASSERT(class_ != NO_FRAME_SIZE_CLASS_ID);
-    MOZ_ASSERT(class_ < mozilla::ArrayLength(FrameSizes));
-
-    return FrameSizes[class_];
-}
 
 ValueOperand
 CodeGeneratorMIPS::ToValue(LInstruction* ins, size_t pos)
 {
     Register typeReg = ToRegister(ins->getOperand(pos + TYPE_INDEX));
     Register payloadReg = ToRegister(ins->getOperand(pos + PAYLOAD_INDEX));
     return ValueOperand(typeReg, payloadReg);
 }
--- a/js/src/jit/mips64/CodeGenerator-mips64.cpp
+++ b/js/src/jit/mips64/CodeGenerator-mips64.cpp
@@ -42,24 +42,16 @@ class js::jit::OutOfLineTableSwitch : pu
     }
 
     CodeLabel* jumpLabel() {
         return &jumpLabel_;
     }
 };
 
 void
-CodeGeneratorMIPS64::visitOutOfLineBailout(OutOfLineBailout* ool)
-{
-    masm.push(ImmWord(ool->snapshot()->snapshotOffset()));
-
-    masm.jump(&deoptLabel_);
-}
-
-void
 CodeGeneratorMIPS64::visitOutOfLineTableSwitch(OutOfLineTableSwitch* ool)
 {
     MTableSwitch* mir = ool->mir();
 
     masm.haltingAlign(sizeof(void*));
     masm.bind(ool->jumpLabel()->target());
     masm.addCodeLabel(*ool->jumpLabel());
 
@@ -106,34 +98,16 @@ CodeGeneratorMIPS64::emitTableSwitchDisp
     // index = size of table entry * index.
     // See CodeGeneratorMIPS64::visitOutOfLineTableSwitch
     masm.lshiftPtr(Imm32(5), index);
     masm.addPtr(index, address);
 
     masm.branch(address);
 }
 
-FrameSizeClass
-FrameSizeClass::FromDepth(uint32_t frameDepth)
-{
-    return FrameSizeClass::None();
-}
-
-FrameSizeClass
-FrameSizeClass::ClassLimit()
-{
-    return FrameSizeClass(0);
-}
-
-uint32_t
-FrameSizeClass::frameSize() const
-{
-    MOZ_CRASH("MIPS64 does not use frame size classes");
-}
-
 ValueOperand
 CodeGeneratorMIPS64::ToValue(LInstruction* ins, size_t pos)
 {
     return ValueOperand(ToRegister(ins->getOperand(pos)));
 }
 
 ValueOperand
 CodeGeneratorMIPS64::ToOutValue(LInstruction* ins)
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -477,16 +477,19 @@ MSG_DEF(JSMSG_QUERY_LINE_WITHOUT_URL, 0,
 MSG_DEF(JSMSG_DEBUG_CANT_SET_OPT_ENV, 1, JSEXN_REFERENCEERR, "can't set `{0}' in an optimized-out environment")
 MSG_DEF(JSMSG_DEBUG_INVISIBLE_COMPARTMENT, 0, JSEXN_TYPEERR, "object in compartment marked as invisible to Debugger")
 MSG_DEF(JSMSG_DEBUG_CENSUS_BREAKDOWN,  1, JSEXN_TYPEERR, "unrecognized 'by' value in takeCensus breakdown: {0}")
 MSG_DEF(JSMSG_DEBUG_PROMISE_NOT_RESOLVED, 0, JSEXN_TYPEERR, "Promise hasn't been resolved")
 MSG_DEF(JSMSG_DEBUG_PROMISE_NOT_FULFILLED, 0, JSEXN_TYPEERR, "Promise hasn't been fulfilled")
 MSG_DEF(JSMSG_DEBUG_PROMISE_NOT_REJECTED, 0, JSEXN_TYPEERR, "Promise hasn't been rejected")
 MSG_DEF(JSMSG_DEBUG_NO_BINARY_SOURCE,  0, JSEXN_ERR, "WebAssembly binary source is not available")
 
+// Testing functions
+MSG_DEF(JSMSG_TESTING_SCRIPTS_ONLY, 0, JSEXN_TYPEERR, "only works on scripts")
+
 // Tracelogger
 MSG_DEF(JSMSG_TRACELOGGER_ENABLE_FAIL, 1, JSEXN_ERR, "enabling tracelogger failed: {0}")
 
 // Intl
 MSG_DEF(JSMSG_DATE_NOT_FINITE,         0, JSEXN_RANGEERR, "date value is not finite in DateTimeFormat.format()")
 MSG_DEF(JSMSG_INTERNAL_INTL_ERROR,     0, JSEXN_ERR, "internal error while computing Intl data")
 MSG_DEF(JSMSG_INTL_OBJECT_NOT_INITED,  3, JSEXN_TYPEERR, "Intl.{0}.prototype.{1} called on value that's not an object initialized as a {2}")
 MSG_DEF(JSMSG_INVALID_CURRENCY_CODE,   1, JSEXN_RANGEERR, "invalid currency code in NumberFormat(): {0}")
--- a/js/src/jsshell.msg
+++ b/js/src/jsshell.msg
@@ -8,17 +8,16 @@
 	Error messages for JSShell. See js.msg for format.
 */
 
 MSG_DEF(JSSMSG_NOT_AN_ERROR,            0, JSEXN_ERR, "<Error #0 is reserved>")
 MSG_DEF(JSSMSG_CANT_OPEN,               2, JSEXN_ERR, "can't open {0}: {1}")
 MSG_DEF(JSSMSG_LINE2PC_USAGE,           0, JSEXN_ERR, "usage: line2pc [fun] line")
 MSG_DEF(JSSMSG_FILE_SCRIPTS_ONLY,       0, JSEXN_ERR, "only works on JS scripts read from files")
 MSG_DEF(JSSMSG_UNEXPECTED_EOF,          1, JSEXN_ERR, "unexpected EOF in {0}")
-MSG_DEF(JSSMSG_SCRIPTS_ONLY,            0, JSEXN_ERR, "only works on scripts")
 MSG_DEF(JSSMSG_NOT_ENOUGH_ARGS,         1, JSEXN_ERR, "{0}: not enough arguments")
 MSG_DEF(JSSMSG_TOO_MANY_ARGS,           1, JSEXN_ERR, "{0}: too many arguments")
 MSG_DEF(JSSMSG_ASSERT_EQ_FAILED,        2, JSEXN_ERR, "Assertion failed: got {0}, expected {1}")
 MSG_DEF(JSSMSG_ASSERT_EQ_FAILED_MSG,    3, JSEXN_ERR, "Assertion failed: got {0}, expected {1}: {2}")
 MSG_DEF(JSSMSG_INVALID_ARGS,            1, JSEXN_ERR, "{0}: invalid arguments")
 MSG_DEF(JSSMSG_BAD_ALIGNMENT,           0, JSEXN_ERR, "serialized data must be 8-byte-aligned")
 MSG_DEF(JSSMSG_NESTED_FAIL,             0, JSEXN_ERR, "error executing nested JS shell")
 MSG_DEF(JSSMSG_CACHE_EQ_SIZE_FAILED,    2, JSEXN_ERR, "cache does not have the same size: got {0}, expected {1}")
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -87,18 +87,16 @@
 #include "shell/jsshell.h"
 #include "shell/OSObject.h"
 #include "threading/ConditionVariable.h"
 #include "threading/ExclusiveData.h"
 #include "threading/LockGuard.h"
 #include "threading/Thread.h"
 #include "util/Windows.h"
 #include "vm/ArgumentsObject.h"
-#include "vm/AsyncFunction.h"
-#include "vm/AsyncIteration.h"
 #include "vm/Compression.h"
 #include "vm/Debugger.h"
 #include "vm/HelperThreads.h"
 #include "vm/JSAtom.h"
 #include "vm/JSContext.h"
 #include "vm/JSFunction.h"
 #include "vm/JSObject.h"
 #include "vm/JSScript.h"
@@ -2448,71 +2446,16 @@ AssertEq(JSContext* cx, unsigned argc, V
         }
         return false;
     }
     args.rval().setUndefined();
     return true;
 }
 
 static JSScript*
-ValueToScript(JSContext* cx, HandleValue v, JSFunction** funp = nullptr)
-{
-    if (v.isString()) {
-        // To convert a string to a script, compile it. Parse it as an ES6 Program.
-        RootedLinearString linearStr(cx, StringToLinearString(cx, v.toString()));
-        if (!linearStr)
-            return nullptr;
-        size_t len = GetLinearStringLength(linearStr);
-        AutoStableStringChars linearChars(cx);
-        if (!linearChars.initTwoByte(cx, linearStr))
-            return nullptr;
-        const char16_t* chars = linearChars.twoByteRange().begin().get();
-
-        RootedScript script(cx);
-        CompileOptions options(cx);
-        if (!JS::Compile(cx, options, chars, len, &script))
-            return nullptr;
-        return script;
-    }
-
-    RootedFunction fun(cx, JS_ValueToFunction(cx, v));
-    if (!fun)
-        return nullptr;
-
-    // Unwrap bound functions.
-    while (fun->isBoundFunction()) {
-        JSObject* target = fun->getBoundFunctionTarget();
-        if (target && target->is<JSFunction>())
-            fun = &target->as<JSFunction>();
-        else
-            break;
-    }
-
-    // Get unwrapped async function.
-    if (IsWrappedAsyncFunction(fun))
-        fun = GetUnwrappedAsyncFunction(fun);
-    if (IsWrappedAsyncGenerator(fun))
-        fun = GetUnwrappedAsyncGenerator(fun);
-
-    if (!fun->isInterpreted()) {
-        JS_ReportErrorNumberASCII(cx, my_GetErrorMessage, nullptr, JSSMSG_SCRIPTS_ONLY);
-        return nullptr;
-    }
-
-    JSScript* script = JSFunction::getOrCreateScript(cx, fun);
-    if (!script)
-        return nullptr;
-
-    if (funp)
-        *funp = fun;
-
-    return script;
-}
-
-static JSScript*
 GetTopScript(JSContext* cx)
 {
     NonBuiltinScriptFrameIter iter(cx);
     return iter.done() ? nullptr : iter.script();
 }
 
 static bool
 GetScriptAndPCArgs(JSContext* cx, CallArgs& args, MutableHandleScript scriptp,
@@ -2520,17 +2463,17 @@ GetScriptAndPCArgs(JSContext* cx, CallAr
 {
     RootedScript script(cx, GetTopScript(cx));
     *ip = 0;
     if (!args.get(0).isUndefined()) {
         HandleValue v = args[0];
         unsigned intarg = 0;
         if (v.isObject() &&
             JS_GetClass(&v.toObject()) == Jsvalify(&JSFunction::class_)) {
-            script = ValueToScript(cx, v);
+            script = TestingFunctionArgumentToScript(cx, v);
             if (!script)
                 return false;
             intarg++;
         }
         if (!args.get(intarg).isUndefined()) {
             if (!JS::ToInt32(cx, args[intarg], ip))
                 return false;
             if ((uint32_t)*ip >= script->length()) {
@@ -2553,17 +2496,17 @@ LineToPC(JSContext* cx, unsigned argc, V
     if (args.length() == 0) {
         JS_ReportErrorNumberASCII(cx, my_GetErrorMessage, nullptr, JSSMSG_LINE2PC_USAGE);
         return false;
     }
 
     RootedScript script(cx, GetTopScript(cx));
     int32_t lineArg = 0;
     if (args[0].isObject() && args[0].toObject().is<JSFunction>()) {
-        script = ValueToScript(cx, args[0]);
+        script = TestingFunctionArgumentToScript(cx, args[0]);
         if (!script)
             return false;
         lineArg++;
     }
 
     uint32_t lineno;
     if (!ToUint32(cx, args.get(lineArg), &lineno))
          return false;
@@ -2759,17 +2702,17 @@ static bool
 Notes(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     Sprinter sprinter(cx);
     if (!sprinter.init())
         return false;
 
     for (unsigned i = 0; i < args.length(); i++) {
-        RootedScript script (cx, ValueToScript(cx, args[i]));
+        RootedScript script (cx, TestingFunctionArgumentToScript(cx, args[i]));
         if (!script)
             return false;
 
         if (!SrcNotes(cx, script, &sprinter))
             return false;
     }
 
     JSString* str = JS_NewStringCopyZ(cx, sprinter.string());
@@ -2997,17 +2940,17 @@ DisassembleToSprinter(JSContext* cx, uns
     } else {
         for (unsigned i = 0; i < p.argc; i++) {
             RootedFunction fun(cx);
             RootedScript script(cx);
             RootedValue value(cx, p.argv[i]);
             if (value.isObject() && value.toObject().is<ModuleObject>())
                 script = value.toObject().as<ModuleObject>().script();
             else
-                script = ValueToScript(cx, value, fun.address());
+                script = TestingFunctionArgumentToScript(cx, value, fun.address());
             if (!script)
                 return false;
             if (!DisassembleScript(cx, script, fun, p.lines, p.recursive, p.sourceNotes, sprinter))
                 return false;
         }
     }
 
     return !sprinter->hadOutOfMemory();
@@ -3117,17 +3060,17 @@ DisassWithSrc(JSContext* cx, unsigned ar
 
     const size_t lineBufLen = 512;
     unsigned len, line1, line2, bupline;
     char linebuf[lineBufLen];
     static const char sep[] = ";-------------------------";
 
     RootedScript script(cx);
     for (unsigned i = 0; i < args.length(); i++) {
-        script = ValueToScript(cx, args[i]);
+        script = TestingFunctionArgumentToScript(cx, args[i]);
         if (!script)
            return false;
 
         if (!script->filename()) {
             JS_ReportErrorNumberASCII(cx, my_GetErrorMessage, nullptr, JSSMSG_FILE_SCRIPTS_ONLY);
             return false;
         }
 
@@ -3312,17 +3255,17 @@ Crash(JSContext* cx, unsigned argc, Valu
 }
 
 static bool
 GetSLX(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     RootedScript script(cx);
 
-    script = ValueToScript(cx, args.get(0));
+    script = TestingFunctionArgumentToScript(cx, args.get(0));
     if (!script)
         return false;
     args.rval().setInt32(GetScriptLineExtent(script));
     return true;
 }
 
 static bool
 ThrowError(JSContext* cx, unsigned argc, Value* vp)
@@ -9135,17 +9078,17 @@ main(int argc, char** argv, char** envp)
         || !op.addBoolOption('\0', "no-threads", "Disable helper threads")
 #ifdef DEBUG
         || !op.addBoolOption('\0', "dump-entrained-variables", "Print variables which are "
                              "unnecessarily entrained by inner functions")
 #endif
         || !op.addBoolOption('\0', "no-ggc", "Disable Generational GC")
         || !op.addBoolOption('\0', "no-cgc", "Disable Compacting GC")
         || !op.addBoolOption('\0', "no-incremental-gc", "Disable Incremental GC")
-        || !op.addBoolOption('\0', "nursery-strings", "Allocate strings in the nursery")
+        || !op.addBoolOption('\0', "no-nursery-strings", "Do not allocate strings in the nursery")
         || !op.addIntOption('\0', "available-memory", "SIZE",
                             "Select GC settings based on available memory (MB)", 0)
         || !op.addStringOption('\0', "arm-hwcap", "[features]",
                                "Specify ARM code generation features, or 'help' to list all features.")
         || !op.addIntOption('\0', "arm-asm-nop-fill", "SIZE",
                             "Insert the given number of NOP instructions at all possible pool locations.", 0)
         || !op.addIntOption('\0', "asm-pool-max-offset", "OFFSET",
                             "The maximum pc relative OFFSET permitted in pool reference instructions.", 1024)
@@ -9283,18 +9226,18 @@ main(int argc, char** argv, char** envp)
     JS::InitConsumeStreamCallback(cx, ConsumeBufferSource);
 
     JS_SetNativeStackQuota(cx, gMaxStackSize);
 
     JS::dbg::SetDebuggerMallocSizeOf(cx, moz_malloc_size_of);
 
     js::UseInternalJobQueues(cx);
 
-    if (op.getBoolOption("nursery-strings"))
-        cx->runtime()->gc.nursery().enableStrings();
+    if (op.getBoolOption("no-nursery-strings"))
+        cx->runtime()->gc.nursery().disableStrings();
 
     if (!JS::InitSelfHostedCode(cx))
         return 1;
 
     EnvironmentPreparer environmentPreparer(cx);
 
     JS_SetGCParameter(cx, JSGC_MODE, JSGC_MODE_INCREMENTAL);
 
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -214,32 +214,34 @@ FinishOffThreadIonCompile(jit::IonBuilde
 
 static JSRuntime*
 GetSelectorRuntime(const CompilationSelector& selector)
 {
     struct Matcher
     {
         JSRuntime* match(JSScript* script)    { return script->runtimeFromActiveCooperatingThread(); }
         JSRuntime* match(JSCompartment* comp) { return comp->runtimeFromActiveCooperatingThread(); }
+        JSRuntime* match(Zone* zone)          { return zone->runtimeFromActiveCooperatingThread(); }
         JSRuntime* match(ZonesInState zbs)    { return zbs.runtime; }
         JSRuntime* match(JSRuntime* runtime)  { return runtime; }
         JSRuntime* match(AllCompilations all) { return nullptr; }
         JSRuntime* match(CompilationsUsingNursery cun) { return cun.runtime; }
     };
 
     return selector.match(Matcher());
 }
 
 static bool
 JitDataStructuresExist(const CompilationSelector& selector)
 {
     struct Matcher
     {
         bool match(JSScript* script)    { return !!script->compartment()->jitCompartment(); }
         bool match(JSCompartment* comp) { return !!comp->jitCompartment(); }
+        bool match(Zone* zone)          { return !!zone->jitZone(); }
         bool match(ZonesInState zbs)    { return zbs.runtime->hasJitRuntime(); }
         bool match(JSRuntime* runtime)  { return runtime->hasJitRuntime(); }
         bool match(AllCompilations all) { return true; }
         bool match(CompilationsUsingNursery cun) { return cun.runtime->hasJitRuntime(); }
     };
 
     return selector.match(Matcher());
 }
@@ -248,16 +250,17 @@ static bool
 IonBuilderMatches(const CompilationSelector& selector, jit::IonBuilder* builder)
 {
     struct BuilderMatches
     {
         jit::IonBuilder* builder_;
 
         bool match(JSScript* script)    { return script == builder_->script(); }
         bool match(JSCompartment* comp) { return comp == builder_->script()->compartment(); }
+        bool match(Zone* zone)          { return zone == builder_->script()->zone(); }
         bool match(JSRuntime* runtime)  { return runtime == builder_->script()->runtimeFromAnyThread(); }
         bool match(AllCompilations all) { return true; }
         bool match(ZonesInState zbs)    {
             return zbs.runtime == builder_->script()->runtimeFromAnyThread() &&
                    zbs.state == builder_->script()->zoneFromAnyThread()->gcState();
         }
         bool match(CompilationsUsingNursery cun) {
             return cun.runtime == builder_->script()->runtimeFromAnyThread() &&
--- a/js/src/vm/HelperThreads.h
+++ b/js/src/vm/HelperThreads.h
@@ -514,16 +514,17 @@ bool
 StartOffThreadIonFree(jit::IonBuilder* builder, const AutoLockHelperThreadState& lock);
 
 struct AllCompilations {};
 struct ZonesInState { JSRuntime* runtime; JS::Zone::GCState state; };
 struct CompilationsUsingNursery { JSRuntime* runtime; };
 
 using CompilationSelector = mozilla::Variant<JSScript*,
                                              JSCompartment*,
+                                             Zone*,
                                              ZonesInState,
                                              JSRuntime*,
                                              CompilationsUsingNursery,
                                              AllCompilations>;
 
 /*
  * Cancel scheduled or in progress Ion compilations.
  */
@@ -538,16 +539,22 @@ CancelOffThreadIonCompile(JSScript* scri
 
 inline void
 CancelOffThreadIonCompile(JSCompartment* comp)
 {
     CancelOffThreadIonCompile(CompilationSelector(comp), true);
 }
 
 inline void
+CancelOffThreadIonCompile(Zone* zone)
+{
+    CancelOffThreadIonCompile(CompilationSelector(zone), true);
+}
+
+inline void
 CancelOffThreadIonCompile(JSRuntime* runtime, JS::Zone::GCState state)
 {
     CancelOffThreadIonCompile(CompilationSelector(ZonesInState{runtime, state}), true);
 }
 
 inline void
 CancelOffThreadIonCompile(JSRuntime* runtime)
 {
--- a/js/xpconnect/loader/mozJSLoaderUtils.cpp
+++ b/js/xpconnect/loader/mozJSLoaderUtils.cpp
@@ -57,13 +57,16 @@ WriteCachedScript(StartupCache* cache, n
         MOZ_ASSERT((code & JS::TranscodeResult_Throw) != 0);
         JS_ClearPendingException(cx);
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
     size_t size = buffer.length();
     if (size > UINT32_MAX)
         return NS_ERROR_FAILURE;
+
+    // Move the vector buffer into a unique pointer buffer.
+    UniquePtr<char[]> buf(reinterpret_cast<char*>(buffer.extractOrCopyRawBuffer()));
     nsresult rv = cache->PutBuffer(PromiseFlatCString(uri).get(),
-                                   reinterpret_cast<char*>(buffer.begin()),
+                                   Move(buf),
                                    size);
     return rv;
 }
--- a/js/xpconnect/shell/xpcshell.cpp
+++ b/js/xpconnect/shell/xpcshell.cpp
@@ -15,17 +15,16 @@
 #ifdef XP_MACOSX
 #include "xpcshellMacUtils.h"
 #endif
 #ifdef XP_WIN
 #include <windows.h>
 #include <shlobj.h>
 
 // we want a wmain entry point
-#define XRE_DONT_PROTECT_DLL_LOAD
 #define XRE_WANT_ENVIRON
 #include "nsWindowsWMain.cpp"
 #ifdef MOZ_SANDBOX
 #include "mozilla/sandboxing/SandboxInitialization.h"
 #endif
 #endif
 
 #ifdef MOZ_WIDGET_GTK
--- 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&