Bug 1376873 - Build system fixes; r=ng
authorDan Minor <dminor@mozilla.com>
Mon, 22 Jan 2018 12:47:24 -0500
changeset 445272 4989aa9ad7e01e986b90a86f875a23e445564ddd
parent 445271 0e2aee1f203314d7be4ee3e8043f1cf38b51fe4e
child 445273 28b57e3ba51de982a4663801a3935580114b5477
push id35014
push userdvarga@mozilla.com
push dateFri, 09 Nov 2018 10:01:40 +0000
treeherdermozilla-central@5e7636ec12c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersng
bugs1376873
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1376873 - Build system fixes; r=ng MozReview-Commit-ID: HPKBZnAMKoI Differential Revision: https://phabricator.services.mozilla.com/D7424
dom/media/gtest/moz.build
dom/media/systemservices/moz.build
ipc/glue/moz.build
media/webrtc/moz.build
media/webrtc/signaling/src/jsep/moz.build
media/webrtc/signaling/src/media-conduit/moz.build
media/webrtc/signaling/src/mediapipeline/moz.build
media/webrtc/signaling/src/peerconnection/moz.build
media/webrtc/trunk/.gn
media/webrtc/trunk/BUILD.gn
media/webrtc/trunk/build/OWNERS
media/webrtc/trunk/build/OWNERS.status
media/webrtc/trunk/build/README.chromium
media/webrtc/trunk/build/android/adb_device_functions.sh
media/webrtc/trunk/build/android/adb_kill_content_shell
media/webrtc/trunk/build/android/adb_logcat_monitor.py
media/webrtc/trunk/build/android/adb_logcat_printer.py
media/webrtc/trunk/build/android/adb_run_content_shell
media/webrtc/trunk/build/android/ant/chromium-jars.xml
media/webrtc/trunk/build/android/ant/common.xml
media/webrtc/trunk/build/android/ant/sdk-targets.xml
media/webrtc/trunk/build/android/buildbot_fyi_builder.sh
media/webrtc/trunk/build/android/buildbot_fyi_tester.sh
media/webrtc/trunk/build/android/buildbot_main.sh
media/webrtc/trunk/build/android/buildbot_try_builder.sh
media/webrtc/trunk/build/android/buildbot_try_compile.sh
media/webrtc/trunk/build/android/buildbot_try_tester.sh
media/webrtc/trunk/build/android/buildbot_webkit_main.sh
media/webrtc/trunk/build/android/device_stats_monitor.py
media/webrtc/trunk/build/android/device_status_check.py
media/webrtc/trunk/build/android/emulator.py
media/webrtc/trunk/build/android/enable_asserts.py
media/webrtc/trunk/build/android/envsetup.sh
media/webrtc/trunk/build/android/envsetup_functions.sh
media/webrtc/trunk/build/android/gdb_apk
media/webrtc/trunk/build/android/gdb_content_shell
media/webrtc/trunk/build/android/gtest_filter/base_unittests_disabled
media/webrtc/trunk/build/android/gtest_filter/base_unittests_emulator_additional_disabled
media/webrtc/trunk/build/android/gtest_filter/content_unittests_disabled
media/webrtc/trunk/build/android/gtest_filter/ipc_tests_disabled
media/webrtc/trunk/build/android/gtest_filter/media_unittests_disabled
media/webrtc/trunk/build/android/gtest_filter/net_unittests_disabled
media/webrtc/trunk/build/android/gtest_filter/sync_unit_tests_disabled
media/webrtc/trunk/build/android/gtest_filter/ui_unittests_disabled
media/webrtc/trunk/build/android/gtest_filter/unit_tests_disabled
media/webrtc/trunk/build/android/lighttpd_server.py
media/webrtc/trunk/build/android/pylib/__init__.py
media/webrtc/trunk/build/android/pylib/android_commands.py
media/webrtc/trunk/build/android/pylib/apk_info.py
media/webrtc/trunk/build/android/pylib/base_test_runner.py
media/webrtc/trunk/build/android/pylib/base_test_sharder.py
media/webrtc/trunk/build/android/pylib/buildbot_report.py
media/webrtc/trunk/build/android/pylib/chrome_test_server_spawner.py
media/webrtc/trunk/build/android/pylib/cmd_helper.py
media/webrtc/trunk/build/android/pylib/constants.py
media/webrtc/trunk/build/android/pylib/debug_info.py
media/webrtc/trunk/build/android/pylib/device_stats_monitor.html
media/webrtc/trunk/build/android/pylib/device_stats_monitor.py
media/webrtc/trunk/build/android/pylib/fake_dns.py
media/webrtc/trunk/build/android/pylib/flag_changer.py
media/webrtc/trunk/build/android/pylib/forwarder.py
media/webrtc/trunk/build/android/pylib/io_stats_parser.py
media/webrtc/trunk/build/android/pylib/java_unittest_utils.py
media/webrtc/trunk/build/android/pylib/json_perf_parser.py
media/webrtc/trunk/build/android/pylib/perf_tests_helper.py
media/webrtc/trunk/build/android/pylib/ports.py
media/webrtc/trunk/build/android/pylib/python_test_base.py
media/webrtc/trunk/build/android/pylib/python_test_caller.py
media/webrtc/trunk/build/android/pylib/python_test_sharder.py
media/webrtc/trunk/build/android/pylib/run_java_tests.py
media/webrtc/trunk/build/android/pylib/run_python_tests.py
media/webrtc/trunk/build/android/pylib/run_tests_helper.py
media/webrtc/trunk/build/android/pylib/sharded_tests_queue.py
media/webrtc/trunk/build/android/pylib/single_test_runner.py
media/webrtc/trunk/build/android/pylib/test_info_collection.py
media/webrtc/trunk/build/android/pylib/test_options_parser.py
media/webrtc/trunk/build/android/pylib/test_package.py
media/webrtc/trunk/build/android/pylib/test_package_apk.py
media/webrtc/trunk/build/android/pylib/test_package_executable.py
media/webrtc/trunk/build/android/pylib/test_result.py
media/webrtc/trunk/build/android/pylib/tests_annotations.py
media/webrtc/trunk/build/android/pylib/valgrind_tools.py
media/webrtc/trunk/build/android/run_instrumentation_tests.py
media/webrtc/trunk/build/android/run_tests.py
media/webrtc/trunk/build/apply_locales.py
media/webrtc/trunk/build/args/OWNERS
media/webrtc/trunk/build/args/README.txt
media/webrtc/trunk/build/args/headless.gn
media/webrtc/trunk/build/asan.saves
media/webrtc/trunk/build/branding_value.sh
media/webrtc/trunk/build/build-ctags.sh
media/webrtc/trunk/build/build_config.h
media/webrtc/trunk/build/buildflag.h
media/webrtc/trunk/build/buildflag_header.gni
media/webrtc/trunk/build/check_gn_headers.py
media/webrtc/trunk/build/check_gn_headers_unittest.py
media/webrtc/trunk/build/check_return_value.py
media/webrtc/trunk/build/clobber.py
media/webrtc/trunk/build/common.croc
media/webrtc/trunk/build/compiled_action.gni
media/webrtc/trunk/build/compiler_version.py
media/webrtc/trunk/build/config/BUILD.gn
media/webrtc/trunk/build/config/BUILDCONFIG.gn
media/webrtc/trunk/build/config/OWNERS
media/webrtc/trunk/build/config/aix/BUILD.gn
media/webrtc/trunk/build/config/allocator.gni
media/webrtc/trunk/build/config/android/BUILD.gn
media/webrtc/trunk/build/config/android/OWNERS
media/webrtc/trunk/build/config/android/config.gni
media/webrtc/trunk/build/config/android/internal_rules.gni
media/webrtc/trunk/build/config/android/rules.gni
media/webrtc/trunk/build/config/arm.gni
media/webrtc/trunk/build/config/chrome_build.gni
media/webrtc/trunk/build/config/chromecast/BUILD.gn
media/webrtc/trunk/build/config/chromecast_build.gni
media/webrtc/trunk/build/config/clang/BUILD.gn
media/webrtc/trunk/build/config/clang/clang.gni
media/webrtc/trunk/build/config/compiler/BUILD.gn
media/webrtc/trunk/build/config/compiler/compiler.gni
media/webrtc/trunk/build/config/compiler/pgo/BUILD.gn
media/webrtc/trunk/build/config/compiler/pgo/pgo.gni
media/webrtc/trunk/build/config/crypto.gni
media/webrtc/trunk/build/config/dcheck_always_on.gni
media/webrtc/trunk/build/config/features.gni
media/webrtc/trunk/build/config/freetype/BUILD.gn
media/webrtc/trunk/build/config/freetype/OWNERS
media/webrtc/trunk/build/config/freetype/freetype.gni
media/webrtc/trunk/build/config/fuchsia/BUILD.gn
media/webrtc/trunk/build/config/fuchsia/OWNERS
media/webrtc/trunk/build/config/fuchsia/config.gni
media/webrtc/trunk/build/config/gcc/BUILD.gn
media/webrtc/trunk/build/config/get_host_byteorder.py
media/webrtc/trunk/build/config/host_byteorder.gni
media/webrtc/trunk/build/config/ios/BUILD.gn
media/webrtc/trunk/build/config/ios/BuildInfo.plist
media/webrtc/trunk/build/config/ios/Host-Info.plist
media/webrtc/trunk/build/config/ios/Module-Info.plist
media/webrtc/trunk/build/config/ios/OWNERS
media/webrtc/trunk/build/config/ios/codesign.py
media/webrtc/trunk/build/config/ios/entitlements.plist
media/webrtc/trunk/build/config/ios/find_signing_identity.py
media/webrtc/trunk/build/config/ios/ios_sdk.gni
media/webrtc/trunk/build/config/ios/rules.gni
media/webrtc/trunk/build/config/ios/write_framework_hmap.py
media/webrtc/trunk/build/config/ios/write_framework_modulemap.py
media/webrtc/trunk/build/config/ios/xctest_shell.mm
media/webrtc/trunk/build/config/linux/BUILD.gn
media/webrtc/trunk/build/config/linux/atk/BUILD.gn
media/webrtc/trunk/build/config/linux/dbus/BUILD.gn
media/webrtc/trunk/build/config/linux/gconf/BUILD.gn
media/webrtc/trunk/build/config/linux/gtk/BUILD.gn
media/webrtc/trunk/build/config/linux/gtk/gtk.gni
media/webrtc/trunk/build/config/linux/gtk2/BUILD.gn
media/webrtc/trunk/build/config/linux/gtk3/BUILD.gn
media/webrtc/trunk/build/config/linux/libffi/BUILD.gn
media/webrtc/trunk/build/config/linux/pangocairo/BUILD.gn
media/webrtc/trunk/build/config/linux/pkg-config.py
media/webrtc/trunk/build/config/linux/pkg_config.gni
media/webrtc/trunk/build/config/locales.gni
media/webrtc/trunk/build/config/mac/BUILD.gn
media/webrtc/trunk/build/config/mac/BuildInfo.plist
media/webrtc/trunk/build/config/mac/OWNERS
media/webrtc/trunk/build/config/mac/base_rules.gni
media/webrtc/trunk/build/config/mac/compile_ib_files.py
media/webrtc/trunk/build/config/mac/mac_sdk.gni
media/webrtc/trunk/build/config/mac/package_framework.py
media/webrtc/trunk/build/config/mac/plist_util.py
media/webrtc/trunk/build/config/mac/prepare_framework_version.py
media/webrtc/trunk/build/config/mac/rules.gni
media/webrtc/trunk/build/config/mac/sdk_info.py
media/webrtc/trunk/build/config/mac/symbols.gni
media/webrtc/trunk/build/config/mac/write_pkg_info.py
media/webrtc/trunk/build/config/mac/xcrun.py
media/webrtc/trunk/build/config/mips.gni
media/webrtc/trunk/build/config/nacl/BUILD.gn
media/webrtc/trunk/build/config/nacl/config.gni
media/webrtc/trunk/build/config/nacl/rules.gni
media/webrtc/trunk/build/config/pch.gni
media/webrtc/trunk/build/config/posix/BUILD.gn
media/webrtc/trunk/build/config/posix/sysroot_ld_path.py
media/webrtc/trunk/build/config/sanitizers/BUILD.gn
media/webrtc/trunk/build/config/sanitizers/OWNERS
media/webrtc/trunk/build/config/sanitizers/sanitizers.gni
media/webrtc/trunk/build/config/sysroot.gni
media/webrtc/trunk/build/config/ui.gni
media/webrtc/trunk/build/config/v8_target_cpu.gni
media/webrtc/trunk/build/config/win/BUILD.gn
media/webrtc/trunk/build/config/win/console_app.gni
media/webrtc/trunk/build/config/win/manifest.gni
media/webrtc/trunk/build/config/win/visual_studio_version.gni
media/webrtc/trunk/build/config/zip.gni
media/webrtc/trunk/build/copy_test_data_ios.py
media/webrtc/trunk/build/cp.py
media/webrtc/trunk/build/detect_host_arch.py
media/webrtc/trunk/build/dir_exists.py
media/webrtc/trunk/build/docs/mac_hermetic_toolchain.md
media/webrtc/trunk/build/dotfile_settings.gni
media/webrtc/trunk/build/download_gold_plugin.py
media/webrtc/trunk/build/download_nacl_toolchains.py
media/webrtc/trunk/build/download_translation_unit_tool.py
media/webrtc/trunk/build/env_dump.py
media/webrtc/trunk/build/escape_unicode.py
media/webrtc/trunk/build/experimental/install-build-deps.py
media/webrtc/trunk/build/extract_from_cab.py
media/webrtc/trunk/build/find_depot_tools.py
media/webrtc/trunk/build/find_isolated_tests.py
media/webrtc/trunk/build/fix_gn_headers.py
media/webrtc/trunk/build/fuchsia/update_sdk.py
media/webrtc/trunk/build/gdb-add-index
media/webrtc/trunk/build/get_landmines.py
media/webrtc/trunk/build/get_syzygy_binaries.py
media/webrtc/trunk/build/git-hooks/OWNERS
media/webrtc/trunk/build/git-hooks/pre-commit
media/webrtc/trunk/build/gn_helpers.py
media/webrtc/trunk/build/gn_helpers_unittest.py
media/webrtc/trunk/build/gn_run_binary.py
media/webrtc/trunk/build/install-build-deps-android.sh
media/webrtc/trunk/build/install-build-deps.sh
media/webrtc/trunk/build/install-chroot.sh
media/webrtc/trunk/build/inverse_depth.py
media/webrtc/trunk/build/ios/OWNERS
media/webrtc/trunk/build/ios/chrome_ios.croc
media/webrtc/trunk/build/ios/clean_env.py
media/webrtc/trunk/build/landmine_utils.py
media/webrtc/trunk/build/landmines.py
media/webrtc/trunk/build/mac/OWNERS
media/webrtc/trunk/build/mac/change_mach_o_flags.py
media/webrtc/trunk/build/mac/change_mach_o_flags_from_xcode.sh
media/webrtc/trunk/build/mac/chrome_mac.croc
media/webrtc/trunk/build/mac/copy_framework_unversioned.sh
media/webrtc/trunk/build/mac/edit_xibs.sh
media/webrtc/trunk/build/mac/find_sdk.py
media/webrtc/trunk/build/mac/make_more_helpers.sh
media/webrtc/trunk/build/mac/should_use_hermetic_xcode.py
media/webrtc/trunk/build/mac/strip_from_xcode
media/webrtc/trunk/build/mac/strip_save_dsym
media/webrtc/trunk/build/mac/tweak_info_plist.gni
media/webrtc/trunk/build/mac/tweak_info_plist.py
media/webrtc/trunk/build/mac/verify_no_objc.sh
media/webrtc/trunk/build/mac_toolchain.py
media/webrtc/trunk/build/nocompile.gni
media/webrtc/trunk/build/output_dll_copy.rules
media/webrtc/trunk/build/package_mac_toolchain.py
media/webrtc/trunk/build/precompile.cc
media/webrtc/trunk/build/precompile.h
media/webrtc/trunk/build/print_python_deps.py
media/webrtc/trunk/build/protoc_java.py
media/webrtc/trunk/build/redirect_stdout.py
media/webrtc/trunk/build/rm.py
media/webrtc/trunk/build/sample_arg_file.gn
media/webrtc/trunk/build/sanitize-mac-build-log.sed
media/webrtc/trunk/build/sanitize-mac-build-log.sh
media/webrtc/trunk/build/sanitize-win-build-log.sed
media/webrtc/trunk/build/sanitize-win-build-log.sh
media/webrtc/trunk/build/sanitizers/OWNERS
media/webrtc/trunk/build/sanitizers/asan_suppressions.cc
media/webrtc/trunk/build/sanitizers/lsan_suppressions.cc
media/webrtc/trunk/build/sanitizers/sanitizer_options.cc
media/webrtc/trunk/build/sanitizers/tsan_suppressions.cc
media/webrtc/trunk/build/secondary/testing/gmock/BUILD.gn
media/webrtc/trunk/build/secondary/testing/gtest/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/android_platform/development/scripts/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/android_platform/development/scripts/stack.pydeps
media/webrtc/trunk/build/secondary/third_party/android_tools/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/android_tools/apk_proguard.flags
media/webrtc/trunk/build/secondary/third_party/crashpad/OWNERS
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/client/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/compat/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/minidump/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/snapshot/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/third_party/apple_cctools/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/third_party/getopt/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/third_party/zlib/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/tools/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/util/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/libjpeg_turbo/BUILD.gn
media/webrtc/trunk/build/secondary/third_party/nss/BUILD.gn
media/webrtc/trunk/build/shim_headers.gni
media/webrtc/trunk/build/slave/OWNERS
media/webrtc/trunk/build/slave/README
media/webrtc/trunk/build/split_static_library.gni
media/webrtc/trunk/build/symlink.gni
media/webrtc/trunk/build/symlink.py
media/webrtc/trunk/build/toolchain/BUILD.gn
media/webrtc/trunk/build/toolchain/OWNERS
media/webrtc/trunk/build/toolchain/aix/BUILD.gn
media/webrtc/trunk/build/toolchain/android/BUILD.gn
media/webrtc/trunk/build/toolchain/cc_wrapper.gni
media/webrtc/trunk/build/toolchain/clang_static_analyzer.gni
media/webrtc/trunk/build/toolchain/clang_static_analyzer_wrapper.py
media/webrtc/trunk/build/toolchain/concurrent_links.gni
media/webrtc/trunk/build/toolchain/cros/BUILD.gn
media/webrtc/trunk/build/toolchain/cros_toolchain.gni
media/webrtc/trunk/build/toolchain/fallback/BUILD.gn
media/webrtc/trunk/build/toolchain/fuchsia/BUILD.gn
media/webrtc/trunk/build/toolchain/fuchsia/OWNERS
media/webrtc/trunk/build/toolchain/gcc_ar_wrapper.py
media/webrtc/trunk/build/toolchain/gcc_compile_wrapper.py
media/webrtc/trunk/build/toolchain/gcc_link_wrapper.py
media/webrtc/trunk/build/toolchain/gcc_solink_wrapper.py
media/webrtc/trunk/build/toolchain/gcc_toolchain.gni
media/webrtc/trunk/build/toolchain/get_concurrent_links.py
media/webrtc/trunk/build/toolchain/goma.gni
media/webrtc/trunk/build/toolchain/linux/BUILD.gn
media/webrtc/trunk/build/toolchain/mac/BUILD.gn
media/webrtc/trunk/build/toolchain/mac/compile_xcassets.py
media/webrtc/trunk/build/toolchain/mac/filter_libtool.py
media/webrtc/trunk/build/toolchain/mac/get_tool_mtime.py
media/webrtc/trunk/build/toolchain/mac/linker_driver.py
media/webrtc/trunk/build/toolchain/nacl/BUILD.gn
media/webrtc/trunk/build/toolchain/nacl_toolchain.gni
media/webrtc/trunk/build/toolchain/toolchain.gni
media/webrtc/trunk/build/toolchain/win/BUILD.gn
media/webrtc/trunk/build/toolchain/win/midl.gni
media/webrtc/trunk/build/toolchain/win/setup_toolchain.py
media/webrtc/trunk/build/toolchain/win/tool_wrapper.py
media/webrtc/trunk/build/toolchain/wrapper_utils.py
media/webrtc/trunk/build/tree_truth.sh
media/webrtc/trunk/build/update-linux-sandbox.sh
media/webrtc/trunk/build/util/BUILD.gn
media/webrtc/trunk/build/util/LASTCHANGE
media/webrtc/trunk/build/util/branding.gni
media/webrtc/trunk/build/util/java_action.gni
media/webrtc/trunk/build/util/java_action.py
media/webrtc/trunk/build/util/lastchange.py
media/webrtc/trunk/build/util/lib/common/PRESUBMIT.py
media/webrtc/trunk/build/util/lib/common/__init__.py
media/webrtc/trunk/build/util/lib/common/perf_result_data_type.py
media/webrtc/trunk/build/util/lib/common/perf_tests_results_helper.py
media/webrtc/trunk/build/util/lib/common/unittest_util.py
media/webrtc/trunk/build/util/lib/common/unittest_util_test.py
media/webrtc/trunk/build/util/lib/common/util.py
media/webrtc/trunk/build/util/process_version.gni
media/webrtc/trunk/build/util/version.gni
media/webrtc/trunk/build/util/version.py
media/webrtc/trunk/build/util/webkit_version.h.in
media/webrtc/trunk/build/vs_toolchain.py
media/webrtc/trunk/build/whitespace_file.txt
media/webrtc/trunk/build/win/BUILD.gn
media/webrtc/trunk/build/win/as_invoker.manifest
media/webrtc/trunk/build/win/chrome_win.croc
media/webrtc/trunk/build/win/common_controls.manifest
media/webrtc/trunk/build/win/compatibility.manifest
media/webrtc/trunk/build/win/copy_cdb_to_output.py
media/webrtc/trunk/build/win/install-build-deps.py
media/webrtc/trunk/build/win/merge_pgc_files.py
media/webrtc/trunk/build/win/message_compiler.gni
media/webrtc/trunk/build/win/message_compiler.py
media/webrtc/trunk/build/win/reorder-imports.py
media/webrtc/trunk/build/win/require_administrator.manifest
media/webrtc/trunk/build/win/run_pgo_profiling_benchmarks.py
media/webrtc/trunk/build/win/setup_cygwin_mount.py
media/webrtc/trunk/build/win/syzygy/BUILD.gn
media/webrtc/trunk/build/win/syzygy/OWNERS
media/webrtc/trunk/build/win/syzygy/instrument.py
media/webrtc/trunk/build/win/syzygy/reorder.py
media/webrtc/trunk/build/win/syzygy/syzyasan-allocation-filter.txt
media/webrtc/trunk/build/win/syzygy/syzyasan-instrumentation-filter.txt
media/webrtc/trunk/build/win/syzygy/syzygy.gni
media/webrtc/trunk/build/win/use_ansi_codes.py
media/webrtc/trunk/build/win_is_xtree_patched.py
media/webrtc/trunk/build/write_build_date_header.py
media/webrtc/trunk/build/write_buildflag_header.py
media/webrtc/trunk/build_overrides/OWNERS
media/webrtc/trunk/build_overrides/README.md
media/webrtc/trunk/build_overrides/build.gni
media/webrtc/trunk/build_overrides/gtest.gni
media/webrtc/trunk/gtest/moz.build
media/webrtc/trunk/moz.build
media/webrtc/trunk/webrtc/BUILD.gn
media/webrtc/trunk/webrtc/api/BUILD.gn
media/webrtc/trunk/webrtc/api/audio_codecs/opus/BUILD.gn
media/webrtc/trunk/webrtc/build/OWNERS
media/webrtc/trunk/webrtc/build/OWNERS.status
media/webrtc/trunk/webrtc/build/README.chromium
media/webrtc/trunk/webrtc/build/all.gyp
media/webrtc/trunk/webrtc/build/all_android.gyp
media/webrtc/trunk/webrtc/build/android/adb_device_functions.sh
media/webrtc/trunk/webrtc/build/android/adb_kill_content_shell
media/webrtc/trunk/webrtc/build/android/adb_logcat_monitor.py
media/webrtc/trunk/webrtc/build/android/adb_logcat_printer.py
media/webrtc/trunk/webrtc/build/android/adb_run_content_shell
media/webrtc/trunk/webrtc/build/android/ant/chromium-jars.xml
media/webrtc/trunk/webrtc/build/android/ant/common.xml
media/webrtc/trunk/webrtc/build/android/ant/sdk-targets.xml
media/webrtc/trunk/webrtc/build/android/buildbot_fyi_builder.sh
media/webrtc/trunk/webrtc/build/android/buildbot_fyi_tester.sh
media/webrtc/trunk/webrtc/build/android/buildbot_main.sh
media/webrtc/trunk/webrtc/build/android/buildbot_try_builder.sh
media/webrtc/trunk/webrtc/build/android/buildbot_try_compile.sh
media/webrtc/trunk/webrtc/build/android/buildbot_try_tester.sh
media/webrtc/trunk/webrtc/build/android/buildbot_webkit_main.sh
media/webrtc/trunk/webrtc/build/android/cpufeatures.gypi
media/webrtc/trunk/webrtc/build/android/device_stats_monitor.py
media/webrtc/trunk/webrtc/build/android/device_status_check.py
media/webrtc/trunk/webrtc/build/android/emulator.py
media/webrtc/trunk/webrtc/build/android/enable_asserts.py
media/webrtc/trunk/webrtc/build/android/envsetup.sh
media/webrtc/trunk/webrtc/build/android/envsetup_functions.sh
media/webrtc/trunk/webrtc/build/android/gdb_apk
media/webrtc/trunk/webrtc/build/android/gdb_content_shell
media/webrtc/trunk/webrtc/build/android/gtest_filter/base_unittests_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/base_unittests_emulator_additional_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/content_unittests_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/ipc_tests_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/media_unittests_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/net_unittests_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/sync_unit_tests_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/ui_unittests_disabled
media/webrtc/trunk/webrtc/build/android/gtest_filter/unit_tests_disabled
media/webrtc/trunk/webrtc/build/android/lighttpd_server.py
media/webrtc/trunk/webrtc/build/android/pylib/__init__.py
media/webrtc/trunk/webrtc/build/android/pylib/android_commands.py
media/webrtc/trunk/webrtc/build/android/pylib/apk_info.py
media/webrtc/trunk/webrtc/build/android/pylib/base_test_runner.py
media/webrtc/trunk/webrtc/build/android/pylib/base_test_sharder.py
media/webrtc/trunk/webrtc/build/android/pylib/buildbot_report.py
media/webrtc/trunk/webrtc/build/android/pylib/chrome_test_server_spawner.py
media/webrtc/trunk/webrtc/build/android/pylib/cmd_helper.py
media/webrtc/trunk/webrtc/build/android/pylib/constants.py
media/webrtc/trunk/webrtc/build/android/pylib/debug_info.py
media/webrtc/trunk/webrtc/build/android/pylib/device_stats_monitor.html
media/webrtc/trunk/webrtc/build/android/pylib/device_stats_monitor.py
media/webrtc/trunk/webrtc/build/android/pylib/fake_dns.py
media/webrtc/trunk/webrtc/build/android/pylib/flag_changer.py
media/webrtc/trunk/webrtc/build/android/pylib/forwarder.py
media/webrtc/trunk/webrtc/build/android/pylib/io_stats_parser.py
media/webrtc/trunk/webrtc/build/android/pylib/java_unittest_utils.py
media/webrtc/trunk/webrtc/build/android/pylib/json_perf_parser.py
media/webrtc/trunk/webrtc/build/android/pylib/perf_tests_helper.py
media/webrtc/trunk/webrtc/build/android/pylib/ports.py
media/webrtc/trunk/webrtc/build/android/pylib/python_test_base.py
media/webrtc/trunk/webrtc/build/android/pylib/python_test_caller.py
media/webrtc/trunk/webrtc/build/android/pylib/python_test_sharder.py
media/webrtc/trunk/webrtc/build/android/pylib/run_java_tests.py
media/webrtc/trunk/webrtc/build/android/pylib/run_python_tests.py
media/webrtc/trunk/webrtc/build/android/pylib/run_tests_helper.py
media/webrtc/trunk/webrtc/build/android/pylib/sharded_tests_queue.py
media/webrtc/trunk/webrtc/build/android/pylib/single_test_runner.py
media/webrtc/trunk/webrtc/build/android/pylib/test_info_collection.py
media/webrtc/trunk/webrtc/build/android/pylib/test_options_parser.py
media/webrtc/trunk/webrtc/build/android/pylib/test_package.py
media/webrtc/trunk/webrtc/build/android/pylib/test_package_apk.py
media/webrtc/trunk/webrtc/build/android/pylib/test_package_executable.py
media/webrtc/trunk/webrtc/build/android/pylib/test_result.py
media/webrtc/trunk/webrtc/build/android/pylib/tests_annotations.py
media/webrtc/trunk/webrtc/build/android/pylib/valgrind_tools.py
media/webrtc/trunk/webrtc/build/android/run_instrumentation_tests.py
media/webrtc/trunk/webrtc/build/android/run_tests.py
media/webrtc/trunk/webrtc/build/apply_locales.py
media/webrtc/trunk/webrtc/build/args/OWNERS
media/webrtc/trunk/webrtc/build/args/README.txt
media/webrtc/trunk/webrtc/build/args/headless.gn
media/webrtc/trunk/webrtc/build/asan.saves
media/webrtc/trunk/webrtc/build/branding_value.sh
media/webrtc/trunk/webrtc/build/build-ctags.sh
media/webrtc/trunk/webrtc/build/build_config.h
media/webrtc/trunk/webrtc/build/buildflag.h
media/webrtc/trunk/webrtc/build/buildflag_header.gni
media/webrtc/trunk/webrtc/build/check_gn_headers.py
media/webrtc/trunk/webrtc/build/check_gn_headers_unittest.py
media/webrtc/trunk/webrtc/build/check_return_value.py
media/webrtc/trunk/webrtc/build/clobber.py
media/webrtc/trunk/webrtc/build/common.croc
media/webrtc/trunk/webrtc/build/compiled_action.gni
media/webrtc/trunk/webrtc/build/compiler_version.py
media/webrtc/trunk/webrtc/build/config/BUILD.gn
media/webrtc/trunk/webrtc/build/config/BUILDCONFIG.gn
media/webrtc/trunk/webrtc/build/config/OWNERS
media/webrtc/trunk/webrtc/build/config/aix/BUILD.gn
media/webrtc/trunk/webrtc/build/config/allocator.gni
media/webrtc/trunk/webrtc/build/config/android/BUILD.gn
media/webrtc/trunk/webrtc/build/config/android/OWNERS
media/webrtc/trunk/webrtc/build/config/android/config.gni
media/webrtc/trunk/webrtc/build/config/android/internal_rules.gni
media/webrtc/trunk/webrtc/build/config/android/rules.gni
media/webrtc/trunk/webrtc/build/config/arm.gni
media/webrtc/trunk/webrtc/build/config/chrome_build.gni
media/webrtc/trunk/webrtc/build/config/chromecast/BUILD.gn
media/webrtc/trunk/webrtc/build/config/chromecast_build.gni
media/webrtc/trunk/webrtc/build/config/clang/BUILD.gn
media/webrtc/trunk/webrtc/build/config/clang/clang.gni
media/webrtc/trunk/webrtc/build/config/compiler/BUILD.gn
media/webrtc/trunk/webrtc/build/config/compiler/compiler.gni
media/webrtc/trunk/webrtc/build/config/compiler/pgo/BUILD.gn
media/webrtc/trunk/webrtc/build/config/compiler/pgo/pgo.gni
media/webrtc/trunk/webrtc/build/config/crypto.gni
media/webrtc/trunk/webrtc/build/config/dcheck_always_on.gni
media/webrtc/trunk/webrtc/build/config/features.gni
media/webrtc/trunk/webrtc/build/config/freetype/BUILD.gn
media/webrtc/trunk/webrtc/build/config/freetype/OWNERS
media/webrtc/trunk/webrtc/build/config/freetype/freetype.gni
media/webrtc/trunk/webrtc/build/config/fuchsia/BUILD.gn
media/webrtc/trunk/webrtc/build/config/fuchsia/OWNERS
media/webrtc/trunk/webrtc/build/config/fuchsia/config.gni
media/webrtc/trunk/webrtc/build/config/gcc/BUILD.gn
media/webrtc/trunk/webrtc/build/config/get_host_byteorder.py
media/webrtc/trunk/webrtc/build/config/host_byteorder.gni
media/webrtc/trunk/webrtc/build/config/ios/BUILD.gn
media/webrtc/trunk/webrtc/build/config/ios/BuildInfo.plist
media/webrtc/trunk/webrtc/build/config/ios/Host-Info.plist
media/webrtc/trunk/webrtc/build/config/ios/Module-Info.plist
media/webrtc/trunk/webrtc/build/config/ios/OWNERS
media/webrtc/trunk/webrtc/build/config/ios/codesign.py
media/webrtc/trunk/webrtc/build/config/ios/entitlements.plist
media/webrtc/trunk/webrtc/build/config/ios/find_signing_identity.py
media/webrtc/trunk/webrtc/build/config/ios/ios_sdk.gni
media/webrtc/trunk/webrtc/build/config/ios/rules.gni
media/webrtc/trunk/webrtc/build/config/ios/write_framework_hmap.py
media/webrtc/trunk/webrtc/build/config/ios/write_framework_modulemap.py
media/webrtc/trunk/webrtc/build/config/ios/xctest_shell.mm
media/webrtc/trunk/webrtc/build/config/linux/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/atk/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/dbus/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/gconf/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/gtk/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/gtk/gtk.gni
media/webrtc/trunk/webrtc/build/config/linux/gtk2/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/gtk3/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/libffi/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/pangocairo/BUILD.gn
media/webrtc/trunk/webrtc/build/config/linux/pkg-config.py
media/webrtc/trunk/webrtc/build/config/linux/pkg_config.gni
media/webrtc/trunk/webrtc/build/config/locales.gni
media/webrtc/trunk/webrtc/build/config/mac/BUILD.gn
media/webrtc/trunk/webrtc/build/config/mac/BuildInfo.plist
media/webrtc/trunk/webrtc/build/config/mac/OWNERS
media/webrtc/trunk/webrtc/build/config/mac/base_rules.gni
media/webrtc/trunk/webrtc/build/config/mac/compile_ib_files.py
media/webrtc/trunk/webrtc/build/config/mac/mac_sdk.gni
media/webrtc/trunk/webrtc/build/config/mac/package_framework.py
media/webrtc/trunk/webrtc/build/config/mac/plist_util.py
media/webrtc/trunk/webrtc/build/config/mac/prepare_framework_version.py
media/webrtc/trunk/webrtc/build/config/mac/rules.gni
media/webrtc/trunk/webrtc/build/config/mac/sdk_info.py
media/webrtc/trunk/webrtc/build/config/mac/symbols.gni
media/webrtc/trunk/webrtc/build/config/mac/write_pkg_info.py
media/webrtc/trunk/webrtc/build/config/mac/xcrun.py
media/webrtc/trunk/webrtc/build/config/mips.gni
media/webrtc/trunk/webrtc/build/config/nacl/BUILD.gn
media/webrtc/trunk/webrtc/build/config/nacl/config.gni
media/webrtc/trunk/webrtc/build/config/nacl/rules.gni
media/webrtc/trunk/webrtc/build/config/pch.gni
media/webrtc/trunk/webrtc/build/config/posix/BUILD.gn
media/webrtc/trunk/webrtc/build/config/posix/sysroot_ld_path.py
media/webrtc/trunk/webrtc/build/config/sanitizers/BUILD.gn
media/webrtc/trunk/webrtc/build/config/sanitizers/OWNERS
media/webrtc/trunk/webrtc/build/config/sanitizers/sanitizers.gni
media/webrtc/trunk/webrtc/build/config/sysroot.gni
media/webrtc/trunk/webrtc/build/config/ui.gni
media/webrtc/trunk/webrtc/build/config/v8_target_cpu.gni
media/webrtc/trunk/webrtc/build/config/win/BUILD.gn
media/webrtc/trunk/webrtc/build/config/win/console_app.gni
media/webrtc/trunk/webrtc/build/config/win/manifest.gni
media/webrtc/trunk/webrtc/build/config/win/visual_studio_version.gni
media/webrtc/trunk/webrtc/build/config/zip.gni
media/webrtc/trunk/webrtc/build/copy_test_data_ios.py
media/webrtc/trunk/webrtc/build/cp.py
media/webrtc/trunk/webrtc/build/detect_host_arch.py
media/webrtc/trunk/webrtc/build/dir_exists.py
media/webrtc/trunk/webrtc/build/docs/mac_hermetic_toolchain.md
media/webrtc/trunk/webrtc/build/dotfile_settings.gni
media/webrtc/trunk/webrtc/build/download_gold_plugin.py
media/webrtc/trunk/webrtc/build/download_nacl_toolchains.py
media/webrtc/trunk/webrtc/build/download_translation_unit_tool.py
media/webrtc/trunk/webrtc/build/env_dump.py
media/webrtc/trunk/webrtc/build/escape_unicode.py
media/webrtc/trunk/webrtc/build/experimental/install-build-deps.py
media/webrtc/trunk/webrtc/build/extract_from_cab.py
media/webrtc/trunk/webrtc/build/find_depot_tools.py
media/webrtc/trunk/webrtc/build/find_isolated_tests.py
media/webrtc/trunk/webrtc/build/fix_gn_headers.py
media/webrtc/trunk/webrtc/build/fuchsia/update_sdk.py
media/webrtc/trunk/webrtc/build/gdb-add-index
media/webrtc/trunk/webrtc/build/get_landmines.py
media/webrtc/trunk/webrtc/build/get_syzygy_binaries.py
media/webrtc/trunk/webrtc/build/git-hooks/OWNERS
media/webrtc/trunk/webrtc/build/git-hooks/pre-commit
media/webrtc/trunk/webrtc/build/gn_helpers.py
media/webrtc/trunk/webrtc/build/gn_helpers_unittest.py
media/webrtc/trunk/webrtc/build/gn_run_binary.py
media/webrtc/trunk/webrtc/build/gyp_chromium
media/webrtc/trunk/webrtc/build/gyp_chromium.py
media/webrtc/trunk/webrtc/build/gyp_environment.py
media/webrtc/trunk/webrtc/build/gyp_helper.py
media/webrtc/trunk/webrtc/build/gypi_to_gn.py
media/webrtc/trunk/webrtc/build/install-build-deps-android.sh
media/webrtc/trunk/webrtc/build/install-build-deps.sh
media/webrtc/trunk/webrtc/build/install-chroot.sh
media/webrtc/trunk/webrtc/build/inverse_depth.py
media/webrtc/trunk/webrtc/build/ios/OWNERS
media/webrtc/trunk/webrtc/build/ios/chrome_ios.croc
media/webrtc/trunk/webrtc/build/ios/clean_env.py
media/webrtc/trunk/webrtc/build/ios/mac_build.gypi
media/webrtc/trunk/webrtc/build/landmine_utils.py
media/webrtc/trunk/webrtc/build/landmines.py
media/webrtc/trunk/webrtc/build/mac/OWNERS
media/webrtc/trunk/webrtc/build/mac/change_mach_o_flags.py
media/webrtc/trunk/webrtc/build/mac/change_mach_o_flags_from_xcode.sh
media/webrtc/trunk/webrtc/build/mac/chrome_mac.croc
media/webrtc/trunk/webrtc/build/mac/copy_framework_unversioned.sh
media/webrtc/trunk/webrtc/build/mac/edit_xibs.sh
media/webrtc/trunk/webrtc/build/mac/find_sdk.py
media/webrtc/trunk/webrtc/build/mac/make_more_helpers.sh
media/webrtc/trunk/webrtc/build/mac/should_use_hermetic_xcode.py
media/webrtc/trunk/webrtc/build/mac/strip_from_xcode
media/webrtc/trunk/webrtc/build/mac/strip_save_dsym
media/webrtc/trunk/webrtc/build/mac/tweak_info_plist.gni
media/webrtc/trunk/webrtc/build/mac/tweak_info_plist.py
media/webrtc/trunk/webrtc/build/mac/verify_no_objc.sh
media/webrtc/trunk/webrtc/build/mac_toolchain.py
media/webrtc/trunk/webrtc/build/nocompile.gni
media/webrtc/trunk/webrtc/build/output_dll_copy.rules
media/webrtc/trunk/webrtc/build/package_mac_toolchain.py
media/webrtc/trunk/webrtc/build/precompile.cc
media/webrtc/trunk/webrtc/build/precompile.h
media/webrtc/trunk/webrtc/build/print_python_deps.py
media/webrtc/trunk/webrtc/build/protoc_java.py
media/webrtc/trunk/webrtc/build/redirect_stdout.py
media/webrtc/trunk/webrtc/build/rm.py
media/webrtc/trunk/webrtc/build/sample_arg_file.gn
media/webrtc/trunk/webrtc/build/sanitize-mac-build-log.sed
media/webrtc/trunk/webrtc/build/sanitize-mac-build-log.sh
media/webrtc/trunk/webrtc/build/sanitize-win-build-log.sed
media/webrtc/trunk/webrtc/build/sanitize-win-build-log.sh
media/webrtc/trunk/webrtc/build/sanitizers/OWNERS
media/webrtc/trunk/webrtc/build/sanitizers/asan_suppressions.cc
media/webrtc/trunk/webrtc/build/sanitizers/lsan_suppressions.cc
media/webrtc/trunk/webrtc/build/sanitizers/sanitizer_options.cc
media/webrtc/trunk/webrtc/build/sanitizers/tsan_suppressions.cc
media/webrtc/trunk/webrtc/build/secondary/testing/gmock/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/testing/gtest/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/android_platform/development/scripts/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/android_platform/development/scripts/stack.pydeps
media/webrtc/trunk/webrtc/build/secondary/third_party/android_tools/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/android_tools/apk_proguard.flags
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/OWNERS
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/client/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/compat/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/minidump/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/snapshot/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/third_party/apple_cctools/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/third_party/getopt/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/third_party/zlib/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/tools/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/util/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/libjpeg_turbo/BUILD.gn
media/webrtc/trunk/webrtc/build/secondary/third_party/nss/BUILD.gn
media/webrtc/trunk/webrtc/build/shim_headers.gni
media/webrtc/trunk/webrtc/build/slave/OWNERS
media/webrtc/trunk/webrtc/build/slave/README
media/webrtc/trunk/webrtc/build/some.gyp
media/webrtc/trunk/webrtc/build/split_static_library.gni
media/webrtc/trunk/webrtc/build/symlink.gni
media/webrtc/trunk/webrtc/build/symlink.py
media/webrtc/trunk/webrtc/build/temp_gyp/README.chromium
media/webrtc/trunk/webrtc/build/temp_gyp/googleurl.gyp
media/webrtc/trunk/webrtc/build/temp_gyp/pdfsqueeze.gyp
media/webrtc/trunk/webrtc/build/toolchain/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/OWNERS
media/webrtc/trunk/webrtc/build/toolchain/aix/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/android/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/cc_wrapper.gni
media/webrtc/trunk/webrtc/build/toolchain/clang_static_analyzer.gni
media/webrtc/trunk/webrtc/build/toolchain/clang_static_analyzer_wrapper.py
media/webrtc/trunk/webrtc/build/toolchain/concurrent_links.gni
media/webrtc/trunk/webrtc/build/toolchain/cros/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/cros_toolchain.gni
media/webrtc/trunk/webrtc/build/toolchain/fallback/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/fuchsia/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/fuchsia/OWNERS
media/webrtc/trunk/webrtc/build/toolchain/gcc_ar_wrapper.py
media/webrtc/trunk/webrtc/build/toolchain/gcc_compile_wrapper.py
media/webrtc/trunk/webrtc/build/toolchain/gcc_link_wrapper.py
media/webrtc/trunk/webrtc/build/toolchain/gcc_solink_wrapper.py
media/webrtc/trunk/webrtc/build/toolchain/gcc_toolchain.gni
media/webrtc/trunk/webrtc/build/toolchain/get_concurrent_links.py
media/webrtc/trunk/webrtc/build/toolchain/goma.gni
media/webrtc/trunk/webrtc/build/toolchain/linux/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/mac/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/mac/compile_xcassets.py
media/webrtc/trunk/webrtc/build/toolchain/mac/filter_libtool.py
media/webrtc/trunk/webrtc/build/toolchain/mac/get_tool_mtime.py
media/webrtc/trunk/webrtc/build/toolchain/mac/linker_driver.py
media/webrtc/trunk/webrtc/build/toolchain/nacl/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/nacl_toolchain.gni
media/webrtc/trunk/webrtc/build/toolchain/toolchain.gni
media/webrtc/trunk/webrtc/build/toolchain/win/BUILD.gn
media/webrtc/trunk/webrtc/build/toolchain/win/midl.gni
media/webrtc/trunk/webrtc/build/toolchain/win/setup_toolchain.py
media/webrtc/trunk/webrtc/build/toolchain/win/tool_wrapper.py
media/webrtc/trunk/webrtc/build/toolchain/wrapper_utils.py
media/webrtc/trunk/webrtc/build/tree_truth.sh
media/webrtc/trunk/webrtc/build/update-linux-sandbox.sh
media/webrtc/trunk/webrtc/build/util/BUILD.gn
media/webrtc/trunk/webrtc/build/util/LASTCHANGE
media/webrtc/trunk/webrtc/build/util/branding.gni
media/webrtc/trunk/webrtc/build/util/java_action.gni
media/webrtc/trunk/webrtc/build/util/java_action.py
media/webrtc/trunk/webrtc/build/util/lastchange.py
media/webrtc/trunk/webrtc/build/util/lib/common/PRESUBMIT.py
media/webrtc/trunk/webrtc/build/util/lib/common/__init__.py
media/webrtc/trunk/webrtc/build/util/lib/common/perf_result_data_type.py
media/webrtc/trunk/webrtc/build/util/lib/common/perf_tests_results_helper.py
media/webrtc/trunk/webrtc/build/util/lib/common/unittest_util.py
media/webrtc/trunk/webrtc/build/util/lib/common/unittest_util_test.py
media/webrtc/trunk/webrtc/build/util/lib/common/util.py
media/webrtc/trunk/webrtc/build/util/process_version.gni
media/webrtc/trunk/webrtc/build/util/version.gni
media/webrtc/trunk/webrtc/build/util/version.py
media/webrtc/trunk/webrtc/build/util/webkit_version.h.in
media/webrtc/trunk/webrtc/build/vs_toolchain.py
media/webrtc/trunk/webrtc/build/whitespace_file.txt
media/webrtc/trunk/webrtc/build/win/BUILD.gn
media/webrtc/trunk/webrtc/build/win/as_invoker.manifest
media/webrtc/trunk/webrtc/build/win/chrome_win.croc
media/webrtc/trunk/webrtc/build/win/common_controls.manifest
media/webrtc/trunk/webrtc/build/win/compatibility.manifest
media/webrtc/trunk/webrtc/build/win/copy_cdb_to_output.py
media/webrtc/trunk/webrtc/build/win/install-build-deps.py
media/webrtc/trunk/webrtc/build/win/merge_pgc_files.py
media/webrtc/trunk/webrtc/build/win/message_compiler.gni
media/webrtc/trunk/webrtc/build/win/message_compiler.py
media/webrtc/trunk/webrtc/build/win/reorder-imports.py
media/webrtc/trunk/webrtc/build/win/require_administrator.manifest
media/webrtc/trunk/webrtc/build/win/run_pgo_profiling_benchmarks.py
media/webrtc/trunk/webrtc/build/win/setup_cygwin_mount.py
media/webrtc/trunk/webrtc/build/win/syzygy/BUILD.gn
media/webrtc/trunk/webrtc/build/win/syzygy/OWNERS
media/webrtc/trunk/webrtc/build/win/syzygy/instrument.py
media/webrtc/trunk/webrtc/build/win/syzygy/reorder.py
media/webrtc/trunk/webrtc/build/win/syzygy/syzyasan-allocation-filter.txt
media/webrtc/trunk/webrtc/build/win/syzygy/syzyasan-instrumentation-filter.txt
media/webrtc/trunk/webrtc/build/win/syzygy/syzygy.gni
media/webrtc/trunk/webrtc/build/win/use_ansi_codes.py
media/webrtc/trunk/webrtc/build/win_is_xtree_patched.py
media/webrtc/trunk/webrtc/build/write_build_date_header.py
media/webrtc/trunk/webrtc/build/write_buildflag_header.py
media/webrtc/trunk/webrtc/build_overrides/OWNERS
media/webrtc/trunk/webrtc/build_overrides/README.md
media/webrtc/trunk/webrtc/build_overrides/build.gni
media/webrtc/trunk/webrtc/build_overrides/gtest.gni
media/webrtc/trunk/webrtc/call/BUILD.gn
media/webrtc/trunk/webrtc/logging/BUILD.gn
media/webrtc/trunk/webrtc/media/BUILD.gn
media/webrtc/trunk/webrtc/modules/BUILD.gn
media/webrtc/trunk/webrtc/modules/audio_coding/BUILD.gn
media/webrtc/trunk/webrtc/modules/audio_device/BUILD.gn
media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
media/webrtc/trunk/webrtc/modules/rtp_rtcp/BUILD.gn
media/webrtc/trunk/webrtc/modules/video_capture/BUILD.gn
media/webrtc/trunk/webrtc/modules/video_processing/BUILD.gn
media/webrtc/trunk/webrtc/moz.build
media/webrtc/trunk/webrtc/rtc_base/BUILD.gn
media/webrtc/trunk/webrtc/system_wrappers/BUILD.gn
media/webrtc/trunk/webrtc/test/BUILD.gn
media/webrtc/trunk/webrtc/video_engine/BUILD.gn
media/webrtc/trunk/webrtc/voice_engine/BUILD.gn
media/webrtc/trunk/webrtc/webrtc.gni
mobile/android/geckoview/build.gradle
--- a/dom/media/gtest/moz.build
+++ b/dom/media/gtest/moz.build
@@ -4,17 +4,18 @@
 # 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/.
 
 include('/media/webrtc/webrtc.mozbuild')
 
 
 LOCAL_INCLUDES += [
     '/media/webrtc/signaling/src/common',
-    '/media/webrtc/trunk'
+    '/media/webrtc/trunk',
+    '/media/webrtc/trunk/webrtc'
 ]
 
 UNIFIED_SOURCES += [
     'MockMediaResource.cpp',
     'TestAudioBuffers.cpp',
     'TestAudioCompactor.cpp',
     'TestAudioMixer.cpp',
     'TestAudioPacketizer.cpp',
--- a/dom/media/systemservices/moz.build
+++ b/dom/media/systemservices/moz.build
@@ -17,16 +17,17 @@ if CONFIG['MOZ_WEBRTC']:
         'CamerasParent.cpp',
         'ShmemPool.cpp',
         'VideoEngine.cpp',
         'VideoFrameUtils.cpp'
     ]
     LOCAL_INCLUDES += [
         '/media/webrtc/signaling',
         '/media/webrtc/trunk',
+        '/media/webrtc/trunk/webrtc',
     ]
 
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['WEBRTC_ANDROID'] = True
 
 
 if CONFIG['OS_TARGET'] == 'Android':
     EXPORTS += [
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -191,16 +191,17 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-
     SOURCES['BackgroundParentImpl.cpp'].flags += ['-wd4312']
 
 LOCAL_INCLUDES += [
     '/caps',
     '/dom/broadcastchannel',
     '/dom/indexedDB',
     '/dom/storage',
     '/media/webrtc/trunk',
+    '/media/webrtc/trunk/webrtc',
     '/xpcom/build',
 ]
 
 IPDL_SOURCES = [
     'InputStreamParams.ipdlh',
     'IPCStream.ipdlh',
     'PBackground.ipdl',
     'PBackgroundSharedTypes.ipdlh',
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -14,16 +14,18 @@ include('/build/gyp.mozbuild')
 include('/build/gn.mozbuild')
 
 webrtc_non_unified_sources = [
     'trunk/webrtc/common_audio/vad/vad_core.c',                                  # Because of name clash in the kInitCheck variable
     'trunk/webrtc/common_audio/vad/webrtc_vad.c',                                # Because of name clash in the kInitCheck variable
     'trunk/webrtc/modules/audio_coding/acm2/codec_manager.cc',                   # Because of duplicate IsCodecRED/etc
     'trunk/webrtc/modules/audio_coding/codecs/g722/g722_decode.c',               # Because of name clash in the saturate function
     'trunk/webrtc/modules/audio_coding/codecs/g722/g722_encode.c',               # Because of name clash in the saturate function
+    'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/decode_plc.c',   # Because of name clash in the exp2_Q10_T function
+    'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c',   # Because of name clash in the exp2_Q10_T function
     'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c',   # Because of name clash in the kDampFilter variable
     'trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c', # Because of name clash in the kDampFilter variable
     'trunk/webrtc/modules/audio_coding/neteq/audio_vector.cc',                   # Because of explicit template specializations
     'trunk/webrtc/modules/audio_device/android/audio_manager.cc',                # Because of TAG redefinition
     'trunk/webrtc/modules/audio_device/android/audio_record_jni.cc',             # Becuse of commonly named module static vars
     'trunk/webrtc/modules/audio_device/android/audio_track_jni.cc',              # Becuse of commonly named module static vars
     'trunk/webrtc/modules/audio_device/android/opensles_player.cc',              # Because of TAG redefinition
     'trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc',       # Because of LATE()
@@ -62,32 +64,31 @@ webrtc_non_unified_sources = [
 gyp_vars_copy = gyp_vars.copy()
 if CONFIG['MOZ_VALGRIND']:
     gyp_vars_copy.update(build_for_tool="memcheck")
 elif CONFIG['MOZ_ASAN']:
     gyp_vars_copy.update(build_for_tool="asan")
 elif CONFIG['MOZ_TSAN']:
     gyp_vars_copy.update(build_for_tool="tsan")
 
-GN_DIRS += ['trunk']
+GN_DIRS += ['trunk/webrtc']
 
 gn_vars_copy = gn_vars.copy()
 
-GN_DIRS['trunk'].variables = gn_vars_copy
-GN_DIRS['trunk'].mozilla_flags = [
+GN_DIRS['trunk/webrtc'].variables = gn_vars_copy
+GN_DIRS['trunk/webrtc'].mozilla_flags = [
     '-fobjc-arc',
     '-mfpu=neon',
     '-msse2',
 ]
-
+GN_DIRS['trunk/webrtc'].gn_target = '//:webrtc'
 # We allow warnings for third-party code that can be updated from upstream.
-GN_DIRS['trunk'].sandbox_vars['COMPILE_FLAGS'] = {'WARNINGS_AS_ERRORS': []}
-GN_DIRS['trunk'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'
-GN_DIRS['trunk'].sandbox_vars['GN_TARGET'] = '//:webrtc'
-GN_DIRS['trunk'].non_unified_sources += webrtc_non_unified_sources
+GN_DIRS['trunk/webrtc'].sandbox_vars['COMPILE_FLAGS'] = {'WARNINGS_AS_ERRORS': []}
+GN_DIRS['trunk/webrtc'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'
+GN_DIRS['trunk/webrtc'].non_unified_sources += webrtc_non_unified_sources
 
 if CONFIG['MOZ_WEBRTC_SIGNALING']:
     DIRS += [
         'signaling/src/common',
         'signaling/src/jsep',
         'signaling/src/media-conduit',
         'signaling/src/mediapipeline',
         'signaling/src/peerconnection',
--- a/media/webrtc/signaling/src/jsep/moz.build
+++ b/media/webrtc/signaling/src/jsep/moz.build
@@ -4,16 +4,17 @@
 # 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/.
 include('/media/webrtc/webrtc.mozbuild')
 
 LOCAL_INCLUDES += [
     '/media/mtransport',
     '/media/webrtc',
     '/media/webrtc/trunk',
+    '/media/webrtc/trunk/webrtc',
 ]
 
 UNIFIED_SOURCES += [
     'JsepSessionImpl.cpp',
     'JsepTrack.cpp',
     'SsrcGenerator.cpp'
 ]
 
--- a/media/webrtc/signaling/src/media-conduit/moz.build
+++ b/media/webrtc/signaling/src/media-conduit/moz.build
@@ -11,16 +11,17 @@ LOCAL_INCLUDES += [
     '/media/libyuv/libyuv/include',
     '/media/mtransport',
     '/media/webrtc',
     '/media/webrtc/signaling/src/common',
     '/media/webrtc/signaling/src/common/browser_logging',
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/peerconnection',
     '/media/webrtc/trunk',
+    '/media/webrtc/trunk/webrtc',
 ]
 
 UNIFIED_SOURCES += [
     'AudioConduit.cpp',
     'GmpVideoCodec.cpp',
     'MediaDataDecoderCodec.cpp',
     'RtpSourceObserver.cpp',
     'VideoConduit.cpp',
--- a/media/webrtc/signaling/src/mediapipeline/moz.build
+++ b/media/webrtc/signaling/src/mediapipeline/moz.build
@@ -9,16 +9,17 @@ LOCAL_INCLUDES += [
     '!/ipc/ipdl/_ipdlheaders',
     '/dom/media',
     '/ipc/chromium/src',
     '/media/libyuv/libyuv/include',
     '/media/mtransport',
     '/media/webrtc',
     '/media/webrtc/signaling/src/media-conduit',
     '/media/webrtc/trunk',
+    '/media/webrtc/trunk/webrtc',
     '/netwerk/srtp/src/crypto/include',
     '/netwerk/srtp/src/include',
 ]
 
 UNIFIED_SOURCES += [
     'MediaPipeline.cpp',
     'MediaPipelineFilter.cpp',
     'RtpLogger.cpp',
--- a/media/webrtc/signaling/src/peerconnection/moz.build
+++ b/media/webrtc/signaling/src/peerconnection/moz.build
@@ -13,16 +13,17 @@ LOCAL_INCLUDES += [
     '/media/mtransport',
     '/media/webrtc',
     '/media/webrtc/signaling/src/common',
     '/media/webrtc/signaling/src/common/browser_logging',
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/media-conduit',
     '/media/webrtc/signaling/src/mediapipeline',
     '/media/webrtc/trunk',
+    '/media/webrtc/trunk/webrtc',
     '/netwerk/srtp/src/include',
 ]
 
 UNIFIED_SOURCES += [
     'MediaTransportHandler.cpp',
     'PacketDumper.cpp',
     'PeerConnectionCtx.cpp',
     'PeerConnectionImpl.cpp',
deleted file mode 100644
--- a/media/webrtc/trunk/.gn
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-import("//build/dotfile_settings.gni")
-
-# The location of the build configuration file.
-buildconfig = "//build/config/BUILDCONFIG.gn"
-
-# The secondary source root is a parallel directory tree where
-# GN build files are placed when they can not be placed directly
-# in the source tree, e.g. for third party source trees.
-secondary_source = "//build/secondary/"
-
-# These are the targets to check headers for by default. The files in targets
-# matching these patterns (see "gn help label_pattern" for format) will have
-# their includes checked for proper dependencies when you run either
-# "gn check" or "gn gen --check".
-# TODO(kjellander): Keep adding paths to this list as work in webrtc:5589 is done.
-check_targets = [
-  "//webrtc/api/*",
-  "//webrtc/audio/*",
-  "//webrtc/modules/audio_coding/*",
-  "//webrtc/modules/audio_conference_mixer/*",
-  "//webrtc/modules/audio_device/*",
-  "//webrtc/modules/audio_mixer/*",
-  "//webrtc/modules/audio_processing/*",
-  "//webrtc/modules/bitrate_controller/*",
-  "//webrtc/modules/congestion_controller/*",
-  "//webrtc/modules/desktop_capture/*",
-  "//webrtc/modules/media_file/*",
-  "//webrtc/modules/pacing/*",
-  "//webrtc/modules/rtp_rtcp/*",
-  "//webrtc/modules/utility/*",
-  "//webrtc/modules/video_capture/*",
-  "//webrtc/modules/video_coding/*",
-  "//webrtc/modules/video_processing/*",
-  "//webrtc/modules/remote_bitrate_estimator/*",
-  "//webrtc/stats:rtc_stats",
-  "//webrtc/voice_engine",
-  "//webrtc/voice_engine:audio_coder",
-  "//webrtc/voice_engine:file_player",
-  "//webrtc/voice_engine:file_recorder",
-  "//webrtc/voice_engine:level_indicator",
-]
-
-# These are the list of GN files that run exec_script. This whitelist exists
-# to force additional review for new uses of exec_script, which is strongly
-# discouraged except for gypi_to_gn calls.
-exec_script_whitelist = build_dotfile_settings.exec_script_whitelist
deleted file mode 100644
--- a/media/webrtc/trunk/BUILD.gn
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-import("webrtc/build/webrtc.gni")
-
-group("default") {
-  testonly = true
-  deps = [
-    "//webrtc",
-  ]
-
-  if (!build_with_mozilla) {
-    deps += [
-      "//webrtc/examples",
-      "//webrtc/tools",
-    ]
-  }
-
-  if (rtc_include_tests) {
-    deps += [ "//webrtc:webrtc_tests" ]
-  }
-}
--- a/media/webrtc/trunk/gtest/moz.build
+++ b/media/webrtc/trunk/gtest/moz.build
@@ -7,44 +7,37 @@
 # Once we have gn support available in the build system
 # (see Bug 1336429) we can use the gn build files directly
 # rather than building things here.
 include('/media/webrtc/webrtc.mozbuild')
 
 AllowCompilerWarnings()
 
 DEFINES['GTEST_RELATIVE_PATH'] = True
-DEFINES['WEBRTC_APM_DEBUG_DUMP'] = True
+DEFINES['WEBRTC_APM_DEBUG_DUMP'] = 0
 DEFINES['WEBRTC_INTELLIGIBILITY_ENHANCER'] = 0
 DEFINES['WEBRTC_MOZILLA_BUILD'] = 1
 
-# Hit build errors on windows with xutility otherwise
-DisableStlWrapping()
-
 LOCAL_INCLUDES += [
     '../',
     '/ipc/chromium/src/',
     '/media/libopus/celt/',
     '/media/libopus/include',
     '/media/libopus/src',
     '/media/libyuv/libyuv/include',
+    '/media/webrtc/trunk/webrtc',
 ]
 
 USE_LIBS += [
     '/media/webrtc/trunk/third_party/gflags/gflags_gflags/gflags',
     '/testing/gtest/gtest',
     'media_libopus',
     'mozglue',
     'speex',
     'webrtc',
-    'webrtc_common_gn',
-    'webrtc_gn',
-    'webrtc_i420_gn',
-    'webrtc_vp8_gn',
-    'webrtc_vp9_gn',
     'yuv',
 ]
 
 if CONFIG['MOZ_SYSTEM_JPEG']:
     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
 else:
     USE_LIBS += ['media_libjpeg']
 
@@ -122,16 +115,17 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'Li
 
         OS_LIBS += [
             "amstrmid",
             "dmoguids",
             'msdmo',
             'shell32',
             'shlwapi',
             'strmiids',
+            "ws2_32",
             "wmcodecdspuuid",
         ]
 
         SOURCES += [
             '../webrtc/modules/desktop_capture/win/cursor_unittest.cc',
         ]
 
     UNIFIED_SOURCES += [
@@ -172,51 +166,45 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'Li
     #    '../webrtc/common_video/libyuv/scaler_unittest.cc',
         '../webrtc/modules/audio_coding/acm2/acm_receive_test.cc',
     # We don't use all of the codecs tested here
     #    '../webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_coding/acm2/acm_send_test.cc',
     #    '../webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc',
         '../webrtc/modules/audio_coding/acm2/call_statistics_unittest.cc',
-    # Stack overflow
-        '../webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc',
     # Test failure
     #    '../webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc',
         '../webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc',
         '../webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc',
         '../webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc',
-        '../webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc',
     # Fails, but we don't build all of the codecs
     #    '../webrtc/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc',
-        '../webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc',
         '../webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc',
         '../webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc',
         '../webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc',
         '../webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc',
         '../webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc',
     # Test failures
     #    '../webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc',
         '../webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc',
-        '../webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.cc',
     # Requires external files
     #    '../webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/background_noise_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc',
-        '../webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_coding/neteq/expand_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/merge_unittest.cc',
@@ -240,17 +228,16 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'Li
         '../webrtc/modules/audio_coding/neteq/tools/input_audio_file.cc',
         '../webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/tools/packet.cc',
         '../webrtc/modules/audio_coding/neteq/tools/packet_source.cc',
         '../webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc',
         '../webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc',
         '../webrtc/modules/audio_coding/neteq/tools/rtp_generator.cc',
         '../webrtc/modules/audio_coding/test/target_delay_unittest.cc',
-        '../webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc',
         '../webrtc/modules/audio_device/fine_audio_buffer_unittest.cc',
         '../webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc',
     # Seg faults
     #    '../webrtc/modules/audio_processing/aec/system_delay_unittest.cc',
         '../webrtc/modules/audio_processing/aec3/block_framer_unittest.cc',
         '../webrtc/modules/audio_processing/aec3/cascaded_biquad_filter_unittest.cc',
         '../webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc',
     # Requires external files
@@ -270,17 +257,18 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'Li
         '../webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc',
         '../webrtc/modules/audio_processing/echo_detector/circular_buffer_unittest.cc',
         '../webrtc/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc',
         '../webrtc/modules/audio_processing/echo_detector/moving_max_unittest.cc',
         '../webrtc/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc',
     # disabled in our build
     #   '../webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc',
     #   '../webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc',
-        '../webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc',
+    # Requires external files
+    #    '../webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc',
         '../webrtc/modules/audio_processing/low_cut_filter_unittest.cc',
         '../webrtc/modules/audio_processing/residual_echo_detector_unittest.cc',
         '../webrtc/modules/audio_processing/splitting_filter_unittest.cc',
         '../webrtc/modules/audio_processing/test/audio_buffer_tools.cc',
         '../webrtc/modules/audio_processing/test/bitexactness_tools.cc',
     # Requires external files
     #    '../webrtc/modules/audio_processing/test/debug_dump_test.cc',
         '../webrtc/modules/audio_processing/test/performance_timer.cc',
@@ -304,234 +292,168 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'Li
         '../webrtc/modules/audio_processing/vad/pole_zero_filter_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc',
         '../webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc',
         '../webrtc/modules/audio_processing/vad/vad_circular_buffer_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_processing/vad/voice_activity_detector_unittest.cc',
         '../webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc',
-        '../webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc',
         '../webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc',
         '../webrtc/modules/desktop_capture/desktop_frame_rotation_unittest.cc',
         '../webrtc/modules/desktop_capture/desktop_region_unittest.cc',
         '../webrtc/modules/desktop_capture/differ_block_unittest.cc',
         '../webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc',
         '../webrtc/modules/desktop_capture/screen_capturer_unittest.cc',
         '../webrtc/modules/desktop_capture/test_utils.cc',
     # Requires external files
     #    '../webrtc/modules/media_file/media_file_unittest.cc',
         '../webrtc/modules/module_common_types_unittest.cc',
         '../webrtc/modules/pacing/bitrate_prober_unittest.cc',
         '../webrtc/modules/pacing/paced_sender_unittest.cc',
-        '../webrtc/modules/pacing/packet_router_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc',
-    # Test fails
-    #    '../webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc',
-        '../webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/bwe.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc',
-    # Requires external files
-    #    '../webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/metric_recorder.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc',
+    # Compile errors
+    #    '../webrtc/modules/pacing/packet_router_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/byte_io_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/fec_test_helper.cc',
-        '../webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc',
+        # Fails to compile
+        #'../webrtc/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc',
-        '../webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc',
         '../webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc',
-        '../webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/time_util_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc',
-        '../webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc',
         '../webrtc/modules/utility/source/process_thread_impl_unittest.cc',
         '../webrtc/modules/video_capture/test/video_capture_unittest.cc',
         '../webrtc/modules/video_coding/codecs/test/packet_manipulator.cc',
-        '../webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc',
         '../webrtc/modules/video_coding/codecs/test/stats.cc',
-        '../webrtc/modules/video_coding/codecs/test/videoprocessor.cc',
         '../webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc',
-        '../webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc',
         '../webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc',
-        '../webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc',
         '../webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.cc',
     # Test failures
     #    '../webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc',
-        '../webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc',
         '../webrtc/modules/video_coding/decoding_state_unittest.cc',
-        '../webrtc/modules/video_coding/frame_buffer2_unittest.cc',
         '../webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc',
         '../webrtc/modules/video_coding/h264_sps_pps_tracker_unittest.cc',
         '../webrtc/modules/video_coding/histogram_unittest.cc',
     # Segfaults
     #    '../webrtc/modules/video_coding/jitter_buffer_unittest.cc',
         '../webrtc/modules/video_coding/nack_module_unittest.cc',
         '../webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc',
         '../webrtc/modules/video_coding/receiver_unittest.cc',
         '../webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc',
-        '../webrtc/modules/video_coding/sequence_number_util_unittest.cc',
         '../webrtc/modules/video_coding/session_info_unittest.cc',
         '../webrtc/modules/video_coding/test/stream_generator.cc',
         '../webrtc/modules/video_coding/timing_unittest.cc',
         '../webrtc/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc',
         '../webrtc/modules/video_coding/utility/frame_dropper_unittest.cc',
         '../webrtc/modules/video_coding/utility/moving_average_unittest.cc',
         '../webrtc/modules/video_coding/utility/quality_scaler_unittest.cc',
         '../webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc',
-        '../webrtc/modules/video_coding/video_coding_robustness_unittest.cc',
         '../webrtc/modules/video_coding/video_packet_buffer_unittest.cc',
         '../webrtc/modules/video_coding/video_receiver_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/video_coding/video_sender_unittest.cc',
+        '../webrtc/rtc_base/fakeclock.cc',
         '../webrtc/system_wrappers/source/aligned_array_unittest.cc',
         '../webrtc/system_wrappers/source/aligned_malloc_unittest.cc',
         '../webrtc/system_wrappers/source/clock_unittest.cc',
-        '../webrtc/system_wrappers/source/condition_variable_unittest.cc',
-        '../webrtc/system_wrappers/source/critical_section_unittest.cc',
-    # Test failures
-       '../webrtc/system_wrappers/source/logging_unittest.cc',
         '../webrtc/system_wrappers/source/ntp_time_unittest.cc',
         '../webrtc/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc',
-        '../webrtc/system_wrappers/source/stringize_macros_unittest.cc',
         '../webrtc/test/encoder_settings.cc',
         '../webrtc/test/fake_decoder.cc',
         '../webrtc/test/fake_encoder.cc',
         '../webrtc/test/fake_texture_frame.cc',
         '../webrtc/test/field_trial.cc',
-        '../webrtc/test/frame_generator.cc',
-        '../webrtc/test/frame_generator_capturer.cc',
-        '../webrtc/test/frame_generator_unittest.cc',
         '../webrtc/test/frame_utils.cc',
         '../webrtc/test/rtcp_packet_parser.cc',
         '../webrtc/test/rtp_file_reader.cc',
     # Requires external files
     #    '../webrtc/test/rtp_file_reader_unittest.cc',
         '../webrtc/test/rtp_file_writer_unittest.cc',
         '../webrtc/test/test_main.cc',
         '../webrtc/test/testsupport/always_passing_unittest.cc',
         '../webrtc/test/testsupport/fileutils.cc',
-        '../webrtc/test/testsupport/frame_reader.cc',
-        '../webrtc/test/testsupport/frame_reader_unittest.cc',
-        '../webrtc/test/testsupport/frame_writer.cc',
         '../webrtc/test/testsupport/metrics/video_metrics.cc',
     # Requires external files
     #    '../webrtc/test/testsupport/metrics/video_metrics_unittest.cc',
         '../webrtc/test/testsupport/packet_reader.cc',
         '../webrtc/test/testsupport/packet_reader_unittest.cc',
         '../webrtc/test/testsupport/perf_test.cc',
-        '../webrtc/test/testsupport/trace_to_stderr.cc',
-        '../webrtc/test/vcm_capturer.cc',
     #    '../webrtc/test/video_capturer.cc',
         '../webrtc/video/call_stats_unittest.cc',
     #    '../webrtc/video/encoder_state_feedback_unittest.cc',
         '../webrtc/video/payload_router_unittest.cc',
         '../webrtc/video/quality_threshold_unittest.cc',
         '../webrtc/video/receive_statistics_proxy_unittest.cc',
         '../webrtc/video/report_block_stats_unittest.cc',
-        '../webrtc/video/send_delay_stats_unittest.cc',
         '../webrtc/video/send_statistics_proxy_unittest.cc',
         '../webrtc/video/stats_counter_unittest.cc',
         '../webrtc/video/stream_synchronization_unittest.cc',
     # SIGABRT, stack smashing detected
     #    '../webrtc/video/vie_encoder_unittest.cc',
-        '../webrtc/video/vie_remb_unittest.cc',
         '../webrtc/voice_engine/channel_unittest.cc',
-    # Test failures
-    #    '../webrtc/voice_engine/file_player_unittests.cc',
-        '../webrtc/voice_engine/transmit_mixer_unittest.cc',
         '../webrtc/voice_engine/utility_unittest.cc',
-        '../webrtc/voice_engine/voe_audio_processing_unittest.cc',
-    # Fails VoEBaseTest.GetVersion!
-    #    '../webrtc/voice_engine/voe_base_unittest.cc',
-        '../webrtc/voice_engine/voe_codec_unittest.cc',
-        '../webrtc/voice_engine/voe_network_unittest.cc',
         'FakeIPC.cpp',
         'FakeNsTraceRefcnt.cpp',
     ]
 
     # Unable to use unified build due to multiply defined symbols
     SOURCES += [
     # These both fail when creating AudioState, looks like a bad mix of mocked and real classes.
     #    '../webrtc/audio/audio_send_stream_unittest.cc',
     #    '../webrtc/audio/audio_state_unittest.cc',
         '../webrtc/common_audio/sparse_fir_filter_unittest.cc',
-        '../webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc',
         '../webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc',
         '../webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc',
-        '../webrtc/modules/audio_processing/aec3/block_processor_unittest.cc',
-        '../webrtc/modules/audio_processing/aec3/echo_canceller3_unittest.cc',
-        '../webrtc/modules/audio_processing/aec3/frame_blocker_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc',
     # Segfaults
     #    '../webrtc/modules/audio_processing/echo_control_mobile_unittest.cc',
     # Disabled in our build
     #   '../webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_processing/level_estimator_unittest.cc',
     # Requires external files
     #    '../webrtc/modules/audio_processing/noise_suppression_unittest.cc',
-        '../webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc',
         '../webrtc/modules/audio_processing/transient/wpd_node_unittest.cc',
-        '../webrtc/modules/congestion_controller/congestion_controller_unittest.cc',
-        '../webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc',
-        '../webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.cc',
         '../webrtc/modules/congestion_controller/median_slope_estimator_unittest.cc',
         '../webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc',
         '../webrtc/modules/congestion_controller/probe_controller_unittest.cc',
-        '../webrtc/modules/congestion_controller/probing_interval_estimator_unittest.cc',
-        '../webrtc/modules/congestion_controller/transport_feedback_adapter_unittest.cc',
         '../webrtc/modules/congestion_controller/trendline_estimator_unittest.cc',
         '../webrtc/modules/desktop_capture/mock_desktop_capturer_callback.cc',
         '../webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc',
         '../webrtc/modules/desktop_capture/window_capturer_unittest.cc',
-        '../webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/flexfec_sender_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc',
-        '../webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc',
-        '../webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc',
     # Test failures
     #   '../webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc',
@@ -541,23 +463,19 @@ if CONFIG['OS_TARGET'] in ['Darwin', 'Li
         '../webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc',
     # Test failures
     #    '../webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/rtp_utility_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc',
         '../webrtc/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc',
         '../webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc',
         '../webrtc/modules/video_coding/codecs/test/stats_unittest.cc',
-        '../webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc',
         '../webrtc/modules/video_coding/video_codec_initializer_unittest.cc',
         '../webrtc/test/rtp_file_writer.cc',
-        '../webrtc/test/testsupport/frame_writer_unittest.cc',
-        '../webrtc/video/overuse_frame_detector_unittest.cc',
-        '../webrtc/voice_engine/voe_codec_unittest.cc',
-        '../webrtc/voice_engine/voice_engine_fixture.cc',
+        '../webrtc/video/send_delay_stats_unittest.cc',
     ]
 
     if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
         CXXFLAGS += [
             '-Wno-inconsistent-missing-override',
             '-Wno-overloaded-virtual',
         ]
         if CONFIG['CC_TYPE'] == 'clang':
--- a/media/webrtc/trunk/webrtc/BUILD.gn
+++ b/media/webrtc/trunk/webrtc/BUILD.gn
@@ -12,17 +12,17 @@ import("webrtc.gni")
 if (!build_with_mozilla) {
   import("//third_party/protobuf/proto_library.gni")
 }
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
-if (!build_with_chromium) {
+if (!build_with_chromium && !build_with_mozilla) {
   group("default") {
     testonly = true
     deps = [
       ":webrtc",
       "examples",
       "rtc_tools",
     ]
     if (rtc_include_tests) {
@@ -77,16 +77,19 @@ config("common_inherited_config") {
     defines += [
       "WEBRTC_MAC",
       "WEBRTC_IOS",
     ]
   }
   if (is_linux) {
     defines += [ "WEBRTC_LINUX" ]
   }
+  if (is_bsd) {
+    defines += [ "WEBRTC_BSD" ]
+  }
   if (is_mac) {
     defines += [ "WEBRTC_MAC" ]
   }
   if (is_win) {
     defines += [
       "WEBRTC_WIN",
       "_CRT_SECURE_NO_WARNINGS",  # Suppress warnings about _vsnprinf
     ]
@@ -277,36 +280,40 @@ if (!build_with_chromium) {
       "api:transport_api",
       "audio",
       "call",
       "common_audio",
       "common_video",
       "media",
       "modules",
       "modules/video_capture:video_capture_internal_impl",
-      "ortc",
       "rtc_base",
-      "sdk",
       "system_wrappers:system_wrappers_default",
       "video",
       "voice_engine",
     ]
 
     if (build_with_mozilla) {
       deps += [
+        "api:base_peerconnection_api",
         "api:video_frame_api",
         "system_wrappers:field_trial_default",
         "system_wrappers:metrics_default",
       ]
+      if (!is_android) {
+        deps += [ "video_engine" ]
+      }
     } else {
       deps += [
         "api",
         "logging",
+        "ortc",
         "p2p",
         "pc",
+        "sdk",
         "stats",
       ]
     }
 
     if (rtc_enable_protobuf) {
       defines += [ "ENABLE_RTC_EVENT_LOG" ]
       deps += [ "logging:rtc_event_log_proto" ]
     }
--- a/media/webrtc/trunk/webrtc/api/BUILD.gn
+++ b/media/webrtc/trunk/webrtc/api/BUILD.gn
@@ -30,159 +30,169 @@ rtc_source_set("call_api") {
     ":audio_mixer_api",
     ":transport_api",
     "..:webrtc_common",
     "../rtc_base:rtc_base_approved",
     "audio_codecs:audio_codecs_api",
   ]
 }
 
-rtc_static_library("libjingle_peerconnection_api") {
-  cflags = []
+rtc_static_library("base_peerconnection_api") {
   sources = [
-    "candidate.cc",
-    "candidate.h",
-    "cryptoparams.h",
-    "datachannelinterface.h",
-    "dtmfsenderinterface.h",
-    "jsep.h",
-    "jsepicecandidate.h",
-    "jsepsessiondescription.h",
-    "mediaconstraintsinterface.cc",
-    "mediaconstraintsinterface.h",
-    "mediastreaminterface.cc",
-    "mediastreamproxy.h",
-    "mediastreamtrackproxy.h",
-    "mediatypes.cc",
-    "mediatypes.h",
-    "notifier.h",
-    "peerconnectionfactoryproxy.h",
-    "peerconnectionproxy.h",
-    "proxy.cc",
-    "proxy.h",
-    "rtcerror.cc",
-    "rtcerror.h",
     "rtpparameters.cc",
     "rtpparameters.h",
-    "rtpreceiverinterface.h",
-    "rtpsenderinterface.h",
-    "rtptransceiverinterface.h",
-    "setremotedescriptionobserverinterface.h",
-    "statstypes.cc",
-    "statstypes.h",
-    "turncustomizer.h",
-    "umametrics.cc",
-    "umametrics.h",
-    "videosourceproxy.h",
-  ]
-
-  if (!build_with_chromium && is_clang) {
-    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-    suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-  }
-
-  public_deps = [
-    ":libjingle_api_deprecated_headers",
-    ":peerconnection_and_implicit_call_api",
-  ]
-
-  deps = [
-    ":optional",
-    ":rtc_stats_api",
-    ":video_frame_api",
-    "audio_codecs:audio_codecs_api",
-
-    # Basically, don't add stuff here. You might break sensitive downstream
-    # targets like pnacl. API should not depend on anything outside of this
-    # file, really. All these should arguably go away in time.
-    "..:webrtc_common",
-    "../modules/audio_processing:audio_processing_statistics",
-    "../rtc_base:rtc_base",
-    "../rtc_base:rtc_base_approved",
-  ]
-
-  # This is needed until bugs.webrtc.org/7504 is removed so this target can
-  # properly depend on ../media:rtc_media_base
-  # TODO(kjellander): Remove this dependency.
-  if (is_nacl) {
-    deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
-  }
-}
-
-rtc_source_set("peerconnection_and_implicit_call_api") {
-  # The peerconnectioninterface.h file pulls in call/callfactoryinterface.h
-  # and the entire call module with it. We need to either get rid of this
-  # dependency or pull most of call/ into the API. For now, silence the warnings
-  # this creates since it creates a circular dependency (call very much depends
-  # on API). See bugs.webrtc.org/7504.
-  check_includes = false
-  sources = [
-    "peerconnectioninterface.h",
   ]
 }
 
-rtc_source_set("libjingle_api_deprecated_headers") {
-  # We need to include headers from undeclared targets here, since they cause
-  # circular dependencies. These deprecated headers are going away anyway.
-  # See http://bugs.webrtc.org/5883.
-  check_includes = false
-  sources = [
-    "datachannel.h",
-    "mediastream.h",
-    "mediastreamtrack.h",
-    "rtpsender.h",
-    "streamcollection.h",
-    "videotracksource.h",
-    "webrtcsdp.h",
-  ]
-}
+if (!build_with_mozilla) {
+  rtc_static_library("libjingle_peerconnection_api") {
+    cflags = []
+    sources = [
+      "candidate.cc",
+      "candidate.h",
+      "cryptoparams.h",
+      "datachannelinterface.h",
+      "dtmfsenderinterface.h",
+      "jsep.h",
+      "jsepicecandidate.h",
+      "jsepsessiondescription.h",
+      "mediaconstraintsinterface.cc",
+      "mediaconstraintsinterface.h",
+      "mediastreaminterface.cc",
+      "mediastreamproxy.h",
+      "mediastreamtrackproxy.h",
+      "mediatypes.cc",
+      "mediatypes.h",
+      "notifier.h",
+      "peerconnectionfactoryproxy.h",
+      "peerconnectionproxy.h",
+      "proxy.cc",
+      "proxy.h",
+      "rtcerror.cc",
+      "rtcerror.h",
+      "rtpreceiverinterface.h",
+      "rtpsenderinterface.h",
+      "rtptransceiverinterface.h",
+      "setremotedescriptionobserverinterface.h",
+      "statstypes.cc",
+      "statstypes.h",
+      "turncustomizer.h",
+      "umametrics.cc",
+      "umametrics.h",
+      "videosourceproxy.h",
+    ]
 
-rtc_source_set("libjingle_logging_api") {
-  sources = [
-    "rtceventlogoutput.h",
-  ]
-}
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+
+    public_deps = [
+      ":libjingle_api_deprecated_headers",
+      ":peerconnection_and_implicit_call_api",
+    ]
+
+    deps = [
+      ":base_peerconnection_api",
+      ":optional",
+      ":rtc_stats_api",
+      ":video_frame_api",
+      "audio_codecs:audio_codecs_api",
+
+      # Basically, don't add stuff here. You might break sensitive downstream
+      # targets like pnacl. API should not depend on anything outside of this
+      # file, really. All these should arguably go away in time.
+      "..:webrtc_common",
+      "../modules/audio_processing:audio_processing_statistics",
+      "../rtc_base:rtc_base",
+      "../rtc_base:rtc_base_approved",
+    ]
+
+    # This is needed until bugs.webrtc.org/7504 is removed so this target can
+    # properly depend on ../media:rtc_media_base
+    # TODO(kjellander): Remove this dependency.
+    if (is_nacl) {
+      deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
+    }
+  }
 
-rtc_source_set("ortc_api") {
-  sources = [
-    "ortc/mediadescription.cc",
-    "ortc/mediadescription.h",
-    "ortc/ortcfactoryinterface.h",
-    "ortc/ortcrtpreceiverinterface.h",
-    "ortc/ortcrtpsenderinterface.h",
-    "ortc/packettransportinterface.h",
-    "ortc/rtptransportcontrollerinterface.h",
-    "ortc/rtptransportinterface.h",
-    "ortc/sessiondescription.cc",
-    "ortc/sessiondescription.h",
-    "ortc/srtptransportinterface.h",
-    "ortc/udptransportinterface.h",
-  ]
+  rtc_source_set("peerconnection_and_implicit_call_api") {
+    # The peerconnectioninterface.h file pulls in call/callfactoryinterface.h
+    # and the entire call module with it. We need to either get rid of this
+    # dependency or pull most of call/ into the API. For now, silence the warnings
+    # this creates since it creates a circular dependency (call very much depends
+    # on API). See bugs.webrtc.org/7504.
+    check_includes = false
+    sources = [
+      "peerconnectioninterface.h",
+    ]
+  }
+
+  rtc_source_set("libjingle_api_deprecated_headers") {
+    # We need to include headers from undeclared targets here, since they cause
+    # circular dependencies. These deprecated headers are going away anyway.
+    # See http://bugs.webrtc.org/5883.
+    check_includes = false
+    sources = [
+      "datachannel.h",
+      "mediastream.h",
+      "mediastreamtrack.h",
+      "rtpsender.h",
+      "streamcollection.h",
+      "videotracksource.h",
+      "webrtcsdp.h",
+    ]
+  }
+
+  rtc_source_set("libjingle_logging_api") {
+    sources = [
+      "rtceventlogoutput.h",
+    ]
+  }
 
-  # For mediastreaminterface.h, etc.
-  # TODO(deadbeef): Create a separate target for the common things ORTC and
-  # PeerConnection code shares, so that ortc_api can depend on that instead of
-  # libjingle_peerconnection_api.
-  deps = [
-    ":libjingle_peerconnection_api",
-    ":optional",
-    "..:webrtc_common",
-    "../rtc_base:rtc_base",
-  ]
-  if (!build_with_chromium && is_clang) {
-    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-    suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+  rtc_source_set("ortc_api") {
+    sources = [
+      "ortc/mediadescription.cc",
+      "ortc/mediadescription.h",
+      "ortc/ortcfactoryinterface.h",
+      "ortc/ortcrtpreceiverinterface.h",
+      "ortc/ortcrtpsenderinterface.h",
+      "ortc/packettransportinterface.h",
+      "ortc/rtptransportcontrollerinterface.h",
+      "ortc/rtptransportinterface.h",
+      "ortc/sessiondescription.cc",
+      "ortc/sessiondescription.h",
+      "ortc/srtptransportinterface.h",
+      "ortc/udptransportinterface.h",
+    ]
+
+    # For mediastreaminterface.h, etc.
+    # TODO(deadbeef): Create a separate target for the common things ORTC and
+    # PeerConnection code shares, so that ortc_api can depend on that instead of
+    # libjingle_peerconnection_api.
+    deps = [
+      ":libjingle_peerconnection_api",
+      ":optional",
+      "..:webrtc_common",
+      "../rtc_base:rtc_base",
+    ]
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
   }
-}
+
+  # TODO(ossu): Remove once downstream projects have updated.
+  rtc_source_set("libjingle_peerconnection") {
+    public_deps = []
 
-# TODO(ossu): Remove once downstream projects have updated.
-rtc_source_set("libjingle_peerconnection") {
-  public_deps = [
-    "../pc:libjingle_peerconnection",
-  ]
+    if (!build_with_mozilla) {
+      public_deps += [ "../pc:libjingle_peerconnection" ]
+    }
+  }
 }
 
 rtc_source_set("rtc_stats_api") {
   cflags = []
   sources = [
     "stats/rtcstats.h",
     "stats/rtcstats_objects.h",
     "stats/rtcstatscollectorcallback.h",
@@ -246,16 +256,19 @@ rtc_source_set("video_frame_api_i420") {
     "video/i420_buffer.cc",
     "video/i420_buffer.h",
   ]
   deps = [
     ":video_frame_api",
     "../rtc_base:rtc_base_approved",
     "../system_wrappers",
   ]
+  if (build_with_mozilla) {
+    include_dirs = [ "/media/libyuv/libyuv/include" ]
+  }
 }
 
 rtc_source_set("array_view") {
   sources = [
     "array_view.h",
   ]
   deps = [
     "../rtc_base:rtc_base_approved",
@@ -277,29 +290,31 @@ rtc_source_set("refcountedbase") {
   sources = [
     "refcountedbase.h",
   ]
   deps = [
     "../rtc_base:rtc_base_approved",
   ]
 }
 
-rtc_source_set("libjingle_peerconnection_test_api") {
-  testonly = true
-  sources = [
-    "test/fakeconstraints.h",
-  ]
+if (rtc_include_tests) {
+  rtc_source_set("libjingle_peerconnection_test_api") {
+    testonly = true
+    sources = [
+      "test/fakeconstraints.h",
+    ]
 
-  public_deps = [
-    ":libjingle_peerconnection_api",
-  ]
+    public_deps = [
+      ":libjingle_peerconnection_api",
+    ]
 
-  deps = [
-    "../rtc_base:rtc_base_approved",
-  ]
+    deps = [
+      "../rtc_base:rtc_base_approved",
+    ]
+  }
 }
 
 if (rtc_include_tests) {
   rtc_source_set("mock_audio_mixer") {
     testonly = true
     sources = [
       "test/mock_audio_mixer.h",
     ]
@@ -333,27 +348,25 @@ if (rtc_include_tests) {
 
   rtc_source_set("fakemetricsobserver") {
     testonly = true
     sources = [
       "fakemetricsobserver.cc",
       "fakemetricsobserver.h",
     ]
     deps = [
+      ":libjingle_peerconnection_api",
       "../api:peerconnection_and_implicit_call_api",
       "../media:rtc_media_base",
       "../rtc_base:rtc_base_approved",
     ]
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
-    if (!build_with_mozilla) {
-      deps += [ ":libjingle_peerconnection_api" ]
-    }
   }
 
   rtc_source_set("rtc_api_unittests") {
     testonly = true
 
     sources = [
       "array_view_unittest.cc",
       "optional_unittest.cc",
--- a/media/webrtc/trunk/webrtc/api/audio_codecs/opus/BUILD.gn
+++ b/media/webrtc/trunk/webrtc/api/audio_codecs/opus/BUILD.gn
@@ -22,16 +22,20 @@ rtc_static_library("audio_encoder_opus_c
     "../../../rtc_base:rtc_base_approved",
   ]
   defines = []
   if (rtc_opus_variable_complexity) {
     defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=1" ]
   } else {
     defines += [ "WEBRTC_OPUS_VARIABLE_COMPLEXITY=0" ]
   }
+
+  if (build_with_mozilla) {
+    include_dirs = [ "/media/libopus/include" ]
+  }
 }
 
 rtc_source_set("audio_encoder_opus") {
   public = [
     "audio_encoder_opus.h",
   ]
   sources = [
     "audio_encoder_opus.cc",
@@ -42,23 +46,31 @@ rtc_source_set("audio_encoder_opus") {
     "../..:optional",
     "../../../modules/audio_coding:webrtc_opus",
     "../../../rtc_base:rtc_base_approved",
   ]
   public_deps = [
     # TODO(kwiberg): Remove this public_dep when bug 7847 has been fixed.
     "../../../rtc_base:protobuf_utils",
   ]
+
+  if (build_with_mozilla) {
+    include_dirs = [ "/media/libopus/include" ]
+  }
 }
 
 rtc_static_library("audio_decoder_opus") {
   sources = [
     "audio_decoder_opus.cc",
     "audio_decoder_opus.h",
   ]
   deps = [
     "..:audio_codecs_api",
     "../..:optional",
     "../../..:webrtc_common",
     "../../../modules/audio_coding:webrtc_opus",
     "../../../rtc_base:rtc_base_approved",
   ]
+
+  if (build_with_mozilla) {
+    include_dirs = [ "/media/libopus/include" ]
+  }
 }
rename from media/webrtc/trunk/build/OWNERS
rename to media/webrtc/trunk/webrtc/build/OWNERS
rename from media/webrtc/trunk/build/OWNERS.status
rename to media/webrtc/trunk/webrtc/build/OWNERS.status
rename from media/webrtc/trunk/build/README.chromium
rename to media/webrtc/trunk/webrtc/build/README.chromium
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/all.gyp
@@ -0,0 +1,716 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'All',
+      'type': 'none',
+      'xcode_create_dependents_test_runner': 1,
+      'dependencies': [
+        'some.gyp:*',
+        '../base/base.gyp:*',
+        '../content/content.gyp:*',
+        '../crypto/crypto.gyp:*',
+        '../media/media.gyp:*',
+        '../net/net.gyp:*',
+        '../sdch/sdch.gyp:*',
+        '../sql/sql.gyp:*',
+        '../testing/gmock.gyp:*',
+        '../testing/gtest.gyp:*',
+        '../third_party/bzip2/bzip2.gyp:*',
+        '../third_party/libxml/libxml.gyp:*',
+        '../third_party/sqlite/sqlite.gyp:*',
+        '../third_party/zlib/zlib.gyp:*',
+        '../ui/ui.gyp:*',
+        '../webkit/support/webkit_support.gyp:*',
+        'temp_gyp/googleurl.gyp:*',
+      ],
+      'conditions': [
+        ['OS!="ios"', {
+          'dependencies': [
+            '../cc/cc_tests.gyp:*',
+            '../chrome/chrome.gyp:*',
+            '../gpu/gpu.gyp:*',
+            '../gpu/tools/tools.gyp:*',
+            '../ipc/ipc.gyp:*',
+            '../jingle/jingle.gyp:*',
+            '../ppapi/ppapi.gyp:*',
+            '../ppapi/ppapi_internal.gyp:*',
+            '../printing/printing.gyp:*',
+            '../skia/skia.gyp:*',
+            '../sync/sync.gyp:*',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
+            '../third_party/cld/cld.gyp:*',
+            '../third_party/codesighs/codesighs.gyp:*',
+            '../third_party/ffmpeg/ffmpeg.gyp:*',
+            '../third_party/iccjpeg/iccjpeg.gyp:*',
+            '../third_party/libpng/libpng.gyp:*',
+            '../third_party/libusb/libusb.gyp:*',
+            '../third_party/libwebp/libwebp.gyp:*',
+            '../third_party/libxslt/libxslt.gyp:*',
+            '../third_party/lzma_sdk/lzma_sdk.gyp:*',
+            '../third_party/mesa/mesa.gyp:*',
+            '../third_party/modp_b64/modp_b64.gyp:*',
+            '../third_party/npapi/npapi.gyp:*',
+            '../third_party/ots/ots.gyp:*',
+            '../third_party/qcms/qcms.gyp:*',
+            '../third_party/re2/re2.gyp:re2',
+            '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
+            '../v8/tools/gyp/v8.gyp:*',
+            '../webkit/compositor_bindings/compositor_bindings_tests.gyp:*',
+            '../webkit/webkit.gyp:*',
+            '<(libjpeg_gyp_path):*',
+          ],
+        }],
+        ['os_posix==1 and OS!="android" and OS!="ios"', {
+          'dependencies': [
+            '../third_party/yasm/yasm.gyp:*#host',
+          ],
+        }],
+        ['OS=="mac" or OS=="ios" or OS=="win"', {
+          'dependencies': [
+            '../third_party/nss/nss.gyp:*',
+           ],
+        }],
+        ['OS=="win" or OS=="ios" or OS=="linux"', {
+          'dependencies': [
+            '../breakpad/breakpad.gyp:*',
+           ],
+        }],
+        ['OS=="mac"', {
+          'dependencies': [
+            '../third_party/ocmock/ocmock.gyp:*',
+          ],
+        }],
+        ['OS=="linux"', {
+          'dependencies': [
+            '../courgette/courgette.gyp:*',
+            '../dbus/dbus.gyp:*',
+            '../sandbox/sandbox.gyp:*',
+          ],
+          'conditions': [
+            ['branding=="Chrome"', {
+              'dependencies': [
+                '../chrome/chrome.gyp:linux_packages_<(channel)',
+              ],
+            }],
+            ['chromeos==0', {
+              'dependencies': [
+                '../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:*',
+              ],
+            }],
+          ],
+        }],
+        ['(toolkit_uses_gtk==1) and (build_with_mozilla==0)', {
+          'dependencies': [
+            '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
+            '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
+          ],
+        }],
+        ['OS=="win"', {
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:*',
+              ],
+            }],
+          ],
+          'dependencies': [
+            '../chrome_frame/chrome_frame.gyp:*',
+            '../cloud_print/cloud_print.gyp:*',
+            '../courgette/courgette.gyp:*',
+            '../rlz/rlz.gyp:*',
+            '../sandbox/sandbox.gyp:*',
+            '../third_party/angle/src/build_angle.gyp:*',
+            '../third_party/bsdiff/bsdiff.gyp:*',
+            '../third_party/bspatch/bspatch.gyp:*',
+            '../third_party/gles2_book/gles2_book.gyp:*',
+            '../tools/memory_watcher/memory_watcher.gyp:*',
+          ],
+        }, {
+          'dependencies': [
+            '../third_party/libevent/libevent.gyp:*',
+          ],
+        }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../ui/views/controls/webview/webview.gyp:*',
+            '../ui/views/views.gyp:*',
+          ],
+        }],
+        ['use_aura==1', {
+          'dependencies': [
+            '../ash/ash.gyp:*',
+            '../ui/aura/aura.gyp:*',
+            '../ui/oak/oak.gyp:*',
+          ],
+        }],
+        ['remoting==1', {
+          'dependencies': [
+            '../remoting/remoting.gyp:*',
+          ],
+        }],
+        ['use_openssl==0', {
+          'dependencies': [
+            '../net/third_party/nss/ssl.gyp:*',
+          ],
+        }],
+      ],
+    }, # target_name: All
+    {
+      'target_name': 'All_syzygy',
+      'type': 'none',
+      'conditions': [
+        ['OS=="win" and fastbuild==0', {
+            'dependencies': [
+              '../chrome/installer/mini_installer_syzygy.gyp:*',
+            ],
+          },
+        ],
+      ],
+    }, # target_name: All_syzygy
+    {
+      'target_name': 'chromium_builder_tests',
+      'type': 'none',
+      'dependencies': [
+        '../base/base.gyp:base_unittests',
+        '../crypto/crypto.gyp:crypto_unittests',
+        '../media/media.gyp:media_unittests',
+        '../net/net.gyp:net_unittests',
+        '../sql/sql.gyp:sql_unittests',
+        '../ui/ui.gyp:ui_unittests',
+        'temp_gyp/googleurl.gyp:googleurl_unittests',
+      ],
+      'conditions': [
+        ['OS!="ios"', {
+          'dependencies': [
+            '../cc/cc_tests.gyp:cc_unittests',
+            '../chrome/chrome.gyp:browser_tests',
+            '../chrome/chrome.gyp:interactive_ui_tests',
+            '../chrome/chrome.gyp:safe_browsing_tests',
+            '../chrome/chrome.gyp:sync_integration_tests',
+            '../chrome/chrome.gyp:unit_tests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../content/content.gyp:content_browsertests',
+            '../content/content.gyp:content_unittests',
+            '../gpu/gpu.gyp:gpu_unittests',
+            '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../ppapi/ppapi_internal.gyp:ppapi_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
+          ],
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            '../chrome/chrome.gyp:installer_util_unittests',
+            '../chrome/chrome.gyp:mini_installer_test',
+            # mini_installer_tests depends on mini_installer. This should be
+            # defined in installer.gyp.
+            '../chrome/installer/mini_installer.gyp:mini_installer',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+            '../courgette/courgette.gyp:courgette_unittests',
+            '../sandbox/sandbox.gyp:sbox_integration_tests',
+            '../sandbox/sandbox.gyp:sbox_unittests',
+            '../sandbox/sandbox.gyp:sbox_validation_tests',
+            '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
+            '../ui/views/views.gyp:views_unittests',
+            '../webkit/webkit.gyp:test_shell_common',
+           ],
+        }],
+        ['OS=="linux"', {
+          'dependencies': [
+            '../sandbox/sandbox.gyp:sandbox_linux_unittests',
+          ],
+        }],
+      ],
+    }, # target_name: chromium_builder_tests
+    {
+      'target_name': 'chromium_2010_builder_tests',
+      'type': 'none',
+      'dependencies': [
+        'chromium_builder_tests',
+      ],
+    }, # target_name: chromium_2010_builder_tests
+  ],
+  'conditions': [
+    ['OS!="ios"', {
+      'targets': [
+        {
+          'target_name': 'chromium_builder_nacl_win_integration',
+          'type': 'none',
+          'dependencies': [
+            'chromium_builder_qa', # needed for pyauto
+            'chromium_builder_tests',
+          ],
+        }, # target_name: chromium_builder_nacl_win_integration
+        {
+          'target_name': 'chromium_builder_perf',
+          'type': 'none',
+          'dependencies': [
+            'chromium_builder_qa', # needed for pyauto
+            '../chrome/chrome.gyp:performance_browser_tests',
+            '../chrome/chrome.gyp:performance_ui_tests',
+            '../chrome/chrome.gyp:sync_performance_tests',
+          ],
+        }, # target_name: chromium_builder_perf
+        {
+          'target_name': 'chromium_gpu_builder',
+          'type': 'none',
+          'dependencies': [
+            '../chrome/chrome.gyp:gpu_tests',
+            '../chrome/chrome.gyp:performance_browser_tests',
+            '../chrome/chrome.gyp:performance_ui_tests',
+            '../gpu/gpu.gyp:gl_tests',
+          ],
+          'conditions': [
+            ['internal_gles2_conform_tests', {
+              'dependencies': [
+                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test',
+              ],
+            }], # internal_gles2_conform
+          ],
+        }, # target_name: chromium_gpu_builder
+        {
+          'target_name': 'chromium_gpu_debug_builder',
+          'type': 'none',
+          'dependencies': [
+            '../chrome/chrome.gyp:gpu_tests',
+            '../gpu/gpu.gyp:gl_tests',
+          ],
+          'conditions': [
+            ['internal_gles2_conform_tests', {
+              'dependencies': [
+                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test',
+              ],
+            }], # internal_gles2_conform
+          ],
+        }, # target_name: chromium_gpu_debug_builder
+        {
+          'target_name': 'chromium_builder_qa',
+          'type': 'none',
+          'dependencies': [
+            '../chrome/chrome.gyp:chromedriver',
+            # Dependencies of pyauto_functional tests.
+            '../remoting/remoting.gyp:remoting_webapp',
+          ],
+# not needed for Mozilla
+#          'conditions': [
+#            # If you change this condition, make sure you also change it
+#            # in chrome_tests.gypi
+#            ['enable_automation==1 and (OS=="mac" or OS=="win" or (os_posix==1 and target_arch==python_arch))', {
+#              'dependencies': [
+#                '../chrome/chrome.gyp:pyautolib',
+#              ],
+#            }],
+            ['OS=="mac"', {
+              'dependencies': [
+                '../remoting/remoting.gyp:remoting_me2me_host_archive',
+              ],
+            }],
+            ['OS=="win" and component != "shared_library" and wix_exists == "True" and sas_dll_exists == "True"', {
+              'dependencies': [
+                '../remoting/remoting.gyp:remoting_host_installation',
+              ],
+            }],
+          ],
+        }, # target_name: chromium_builder_qa
+        {
+          'target_name': 'chromium_builder_perf_av',
+          'type': 'none',
+          'dependencies': [
+            'chromium_builder_qa',  # needed for perf pyauto tests
+            '../webkit/webkit.gyp:pull_in_DumpRenderTree',  # to run layout tests
+          ],
+        },  # target_name: chromium_builder_perf_av
+      ],  # targets
+    }],
+    ['OS=="mac"', {
+      'targets': [
+        {
+          # Target to build everything plus the dmg.  We don't put the dmg
+          # in the All target because developers really don't need it.
+          'target_name': 'all_and_dmg',
+          'type': 'none',
+          'dependencies': [
+            'All',
+            '../chrome/chrome.gyp:build_app_dmg',
+          ],
+        },
+        # These targets are here so the build bots can use them to build
+        # subsets of a full tree for faster cycle times.
+        {
+          'target_name': 'chromium_builder_dbg',
+          'type': 'none',
+          'dependencies': [
+            '../cc/cc_tests.gyp:cc_unittests',
+            '../chrome/chrome.gyp:browser_tests',
+            '../chrome/chrome.gyp:interactive_ui_tests',
+            '../chrome/chrome.gyp:safe_browsing_tests',
+            '../chrome/chrome.gyp:sync_integration_tests',
+            '../chrome/chrome.gyp:unit_tests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../content/content.gyp:content_browsertests',
+            '../content/content.gyp:content_unittests',
+            '../ui/ui.gyp:ui_unittests',
+            '../gpu/gpu.gyp:gpu_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../media/media.gyp:media_unittests',
+            '../ppapi/ppapi_internal.gyp:ppapi_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../rlz/rlz.gyp:*',
+            '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_rel',
+          'type': 'none',
+          'dependencies': [
+            '../cc/cc_tests.gyp:cc_unittests',
+            '../chrome/chrome.gyp:browser_tests',
+            '../chrome/chrome.gyp:performance_browser_tests',
+            '../chrome/chrome.gyp:performance_ui_tests',
+            '../chrome/chrome.gyp:safe_browsing_tests',
+            '../chrome/chrome.gyp:sync_integration_tests',
+            '../chrome/chrome.gyp:unit_tests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../content/content.gyp:content_browsertests',
+            '../content/content.gyp:content_unittests',
+            '../ui/ui.gyp:ui_unittests',
+            '../gpu/gpu.gyp:gpu_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../media/media.gyp:media_unittests',
+            '../ppapi/ppapi_internal.gyp:ppapi_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_dbg_tsan_mac',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_unittests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../crypto/crypto.gyp:crypto_unittests',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
+            '../net/net.gyp:net_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../media/media.gyp:media_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_asan_mac',
+          'type': 'none',
+          'dependencies': [
+            '../chrome/chrome.gyp:chrome',
+            '../net/net.gyp:dns_fuzz_stub',
+            '../webkit/webkit.gyp:pull_in_DumpRenderTree',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_dbg_valgrind_mac',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_unittests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../crypto/crypto.gyp:crypto_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../media/media.gyp:media_unittests',
+            '../net/net.gyp:net_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../chrome/chrome.gyp:safe_browsing_tests',
+            '../chrome/chrome.gyp:unit_tests',
+            '../content/content.gyp:content_unittests',
+            '../ui/ui.gyp:ui_unittests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
+          ],
+        },
+      ],  # targets
+    }], # OS="mac"
+    ['OS=="win"', {
+      'targets': [
+        # These targets are here so the build bots can use them to build
+        # subsets of a full tree for faster cycle times.
+        {
+          'target_name': 'chromium_builder',
+          'type': 'none',
+          'dependencies': [
+            '../cc/cc_tests.gyp:cc_unittests',
+            '../chrome/chrome.gyp:browser_tests',
+            '../chrome/chrome.gyp:installer_util_unittests',
+            '../chrome/chrome.gyp:interactive_ui_tests',
+            '../chrome/chrome.gyp:mini_installer_test',
+            '../chrome/chrome.gyp:performance_browser_tests',
+            '../chrome/chrome.gyp:performance_ui_tests',
+            '../chrome/chrome.gyp:safe_browsing_tests',
+            '../chrome/chrome.gyp:sync_integration_tests',
+            '../chrome/chrome.gyp:unit_tests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../content/content.gyp:content_browsertests',
+            '../content/content.gyp:content_unittests',
+            # mini_installer_tests depends on mini_installer. This should be
+            # defined in installer.gyp.
+            '../chrome/installer/mini_installer.gyp:mini_installer',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+            '../courgette/courgette.gyp:courgette_unittests',
+            '../ui/ui.gyp:ui_unittests',
+            '../gpu/gpu.gyp:gpu_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../media/media.gyp:media_unittests',
+            '../ppapi/ppapi_internal.gyp:ppapi_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../sql/sql.gyp:sql_unittests',
+            '../sync/sync.gyp:sync_unit_tests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../ui/views/views.gyp:views_unittests',
+            '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
+            '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_win_cf',
+          'type': 'none',
+          'dependencies': [
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_dbg_tsan_win',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_unittests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../content/content.gyp:content_unittests',
+            '../crypto/crypto.gyp:crypto_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../media/media.gyp:media_unittests',
+            '../net/net.gyp:net_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../sql/sql.gyp:sql_unittests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_dbg_drmemory_win',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_unittests',
+            '../chrome/chrome.gyp:unit_tests',
+            '../cloud_print/cloud_print.gyp:cloud_print_unittests',
+            '../content/content.gyp:content_unittests',
+            '../crypto/crypto.gyp:crypto_unittests',
+            '../ipc/ipc.gyp:ipc_tests',
+            '../jingle/jingle.gyp:jingle_unittests',
+            '../media/media.gyp:media_unittests',
+            '../net/net.gyp:net_unittests',
+            '../printing/printing.gyp:printing_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../sql/sql.gyp:sql_unittests',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+            '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            'temp_gyp/googleurl.gyp:googleurl_unittests',
+          ],
+        },
+        {
+          'target_name': 'webkit_builder_win',
+          'type': 'none',
+          'dependencies': [
+            '../webkit/webkit.gyp:test_shell',
+            '../webkit/webkit.gyp:test_shell_tests',
+            '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
+            '../webkit/webkit.gyp:pull_in_DumpRenderTree',
+          ],
+        },
+        {
+          'target_name': 'chromium_builder_qa_nacl_win64',
+          'type': 'none',
+          'dependencies': [
+            'chromium_builder_qa', # needed for pyauto
+            '../chrome/chrome.gyp:chrome_nacl_win64',
+          ],
+        }, # target_name: chromium_builder_qa_nacl_win64
+      ],  # targets
+      'conditions': [
+        ['branding=="Chrome"', {
+          'targets': [
+            {
+              'target_name': 'chrome_official_builder',
+              'type': 'none',
+              'dependencies': [
+                '../chrome/chrome.gyp:chromedriver',
+                '../chrome/chrome.gyp:crash_service',
+                '../chrome/chrome.gyp:crash_service_win64',
+                '../chrome/chrome.gyp:performance_ui_tests',
+                '../chrome/chrome.gyp:policy_templates',
+                '../chrome/chrome.gyp:pyautolib',
+                '../chrome/chrome.gyp:reliability_tests',
+                '../chrome/chrome.gyp:automated_ui_tests',
+                '../chrome/installer/mini_installer.gyp:mini_installer',
+                '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+                '../courgette/courgette.gyp:courgette',
+                '../courgette/courgette.gyp:courgette64',
+                '../cloud_print/cloud_print.gyp:cloud_print',
+                '../remoting/remoting.gyp:remoting_webapp',
+                '../third_party/adobe/flash/flash_player.gyp:flash_player',
+                '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin',
+              ],
+              'conditions': [
+                ['internal_pdf', {
+                  'dependencies': [
+                    '../pdf/pdf.gyp:pdf',
+                  ],
+                }], # internal_pdf
+                ['component != "shared_library" and wix_exists == "True" and \
+                    sas_dll_exists == "True"', {
+                  'dependencies': [
+                    '../remoting/remoting.gyp:remoting_host_installation',
+                  ],
+                }], # component != "shared_library"
+              ]
+            },
+          ], # targets
+        }], # branding=="Chrome"
+       ], # conditions
+    }], # OS="win"
+    ['use_aura==1', {
+      'targets': [
+        {
+          'target_name': 'aura_builder',
+          'type': 'none',
+          'dependencies': [
+            '../cc/cc_tests.gyp:cc_unittests',
+            '../chrome/chrome.gyp:browser_tests',
+            '../chrome/chrome.gyp:chrome',
+            '../chrome/chrome.gyp:interactive_ui_tests',
+            '../chrome/chrome.gyp:unit_tests',
+            '../content/content.gyp:content_browsertests',
+            '../content/content.gyp:content_unittests',
+            '../ppapi/ppapi_internal.gyp:ppapi_unittests',
+            '../remoting/remoting.gyp:remoting_unittests',
+            '../ui/aura/aura.gyp:*',
+            '../ui/compositor/compositor.gyp:*',
+            '../ui/ui.gyp:ui_unittests',
+            '../ui/views/views.gyp:views',
+            '../ui/views/views.gyp:views_unittests',
+            '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
+            '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
+          ],
+          'conditions': [
+            ['OS=="win"', {
+              # Remove this when we have the real compositor.
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll']
+                },
+              ],
+              'dependencies': [
+                '../content/content.gyp:content_unittests',
+                '../chrome/chrome.gyp:crash_service',
+                '../chrome/chrome.gyp:crash_service_win64',
+              ],
+            }],
+            ['use_ash==1', {
+              'dependencies': [
+                '../ash/ash.gyp:ash_shell',
+                '../ash/ash.gyp:ash_unittests',
+              ],
+            }],
+            ['OS=="linux"', {
+              # Tests that currently only work on Linux.
+              'dependencies': [
+                '../base/base.gyp:base_unittests',
+                '../content/content.gyp:content_unittests',
+                '../ipc/ipc.gyp:ipc_tests',
+                '../sql/sql.gyp:sql_unittests',
+                '../sync/sync.gyp:sync_unit_tests',
+              ],
+            }],
+            ['OS=="mac"', {
+              # Exclude dependencies that are not currently implemented.
+              'dependencies!': [
+                '../chrome/chrome.gyp:chrome',
+                '../chrome/chrome.gyp:unit_tests',
+                '../ui/views/views.gyp:views_unittests',
+              ],
+            }],
+            ['chromeos==1', {
+              'dependencies': [
+                '../chromeos/chromeos.gyp:chromeos_unittests',
+              ],
+            }],
+          ],
+        },
+      ],  # targets
+    }], # "use_aura==1"
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'chromium_swarm_tests',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_unittests_run',
+            '../chrome/chrome.gyp:browser_tests_run',
+            '../chrome/chrome.gyp:unit_tests_run',
+            '../net/net.gyp:net_unittests_run',
+          ],
+        }, # target_name: chromium_swarm_tests
+      ],
+    }],
+  ], # conditions
+}
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/all_android.gyp
@@ -0,0 +1,115 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is all.gyp file for Android to prevent breakage in Android and other
+# platform; It will be churning a lot in the short term and eventually be merged
+# into all.gyp.
+
+{
+  'variables': {
+    # A hook that can be overridden in other repositories to add additional
+    # compilation targets to 'All'
+    'android_app_targets%': [],
+  },
+  'targets': [
+    {
+      'target_name': 'All',
+      'type': 'none',
+      'dependencies': [
+        '../content/content.gyp:content_shell_apk',
+        '<@(android_app_targets)',
+        'android_builder_tests',
+        '../android_webview/android_webview.gyp:android_webview_apk',
+        '../chrome/chrome.gyp:chromium_testshell',
+      ],
+    }, # target_name: All
+    {
+      # The current list of tests for android.  This is temporary
+      # until the full set supported.  If adding a new test here,
+      # please also add it to build/android/run_tests.py, else the
+      # test is not run.
+      #
+      # WARNING:
+      # Do not add targets here without communicating the implications
+      # on tryserver triggers and load.  Discuss with jrg please.
+      'target_name': 'android_builder_tests',
+      'type': 'none',
+      'dependencies': [
+        '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests',
+        '../base/base.gyp:base_unittests',
+        '../cc/cc_tests.gyp:cc_unittests',
+        '../chrome/chrome.gyp:unit_tests',
+        '../content/content.gyp:content_shell_test_apk',
+        '../content/content.gyp:content_unittests',
+        '../gpu/gpu.gyp:gpu_unittests',
+        '../ipc/ipc.gyp:ipc_tests',
+        '../media/media.gyp:media_unittests',
+        '../net/net.gyp:net_unittests',
+        '../sql/sql.gyp:sql_unittests',
+        '../sync/sync.gyp:sync_unit_tests',
+        '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
+        '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor',
+        '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
+        '../tools/android/forwarder2/forwarder.gyp:forwarder2',
+        '../tools/android/md5sum/md5sum.gyp:md5sum',
+        '../ui/ui.gyp:ui_unittests',
+        # From here down: not added to run_tests.py yet.
+        '../jingle/jingle.gyp:jingle_unittests',
+        # Required by ui_unittests.
+        # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but
+        # this would cause circular gyp dependency which needs refactoring the
+        # gyps to resolve.
+        '../chrome/chrome_resources.gyp:packed_resources',
+      ],
+      'conditions': [
+        ['linux_breakpad==1', {
+          'dependencies': [
+            '../breakpad/breakpad.gyp:breakpad_unittests',
+          ],
+        }],
+        ['"<(gtest_target_type)"=="shared_library"', {
+          'dependencies': [
+            # The first item is simply the template.  We add as a dep
+            # to make sure it builds in ungenerated form.  TODO(jrg):
+            # once stable, transition to a test-only (optional)
+            # target.
+            '../testing/android/native_test.gyp:native_test_apk',
+            # Unit test bundles packaged as an apk.
+            '../base/base.gyp:base_unittests_apk',
+            '../cc/cc_tests.gyp:cc_unittests_apk',
+            '../chrome/chrome.gyp:unit_tests_apk',
+            '../content/content.gyp:content_unittests_apk',
+            '../gpu/gpu.gyp:gpu_unittests_apk',
+            '../ipc/ipc.gyp:ipc_tests_apk',
+            '../media/media.gyp:media_unittests_apk',
+            '../net/net.gyp:net_unittests_apk',
+            '../sql/sql.gyp:sql_unittests_apk',
+            '../sync/sync.gyp:sync_unit_tests_apk',
+            '../ui/ui.gyp:ui_unittests_apk',
+            '../android_webview/android_webview.gyp:android_webview_test_apk',
+            '../chrome/chrome.gyp:chromium_testshell_test_apk',
+          ],
+        }],
+      ],
+    },
+    {
+      # Experimental / in-progress targets that are expected to fail
+      # but we still try to compile them on bots (turning the stage
+      # orange, not red).
+      'target_name': 'android_experimental',
+      'type': 'none',
+      'dependencies': [
+      ],
+    },
+    {
+      # In-progress targets that are expected to fail and are NOT run
+      # on any bot.
+      'target_name': 'android_in_progress',
+      'type': 'none',
+      'dependencies': [
+        '../content/content.gyp:content_browsertests',
+      ],
+    },
+  ],  # targets
+}
rename from media/webrtc/trunk/build/android/adb_device_functions.sh
rename to media/webrtc/trunk/webrtc/build/android/adb_device_functions.sh
rename from media/webrtc/trunk/build/android/adb_kill_content_shell
rename to media/webrtc/trunk/webrtc/build/android/adb_kill_content_shell
rename from media/webrtc/trunk/build/android/adb_logcat_monitor.py
rename to media/webrtc/trunk/webrtc/build/android/adb_logcat_monitor.py
rename from media/webrtc/trunk/build/android/adb_logcat_printer.py
rename to media/webrtc/trunk/webrtc/build/android/adb_logcat_printer.py
rename from media/webrtc/trunk/build/android/adb_run_content_shell
rename to media/webrtc/trunk/webrtc/build/android/adb_run_content_shell
rename from media/webrtc/trunk/build/android/ant/chromium-jars.xml
rename to media/webrtc/trunk/webrtc/build/android/ant/chromium-jars.xml
rename from media/webrtc/trunk/build/android/ant/common.xml
rename to media/webrtc/trunk/webrtc/build/android/ant/common.xml
rename from media/webrtc/trunk/build/android/ant/sdk-targets.xml
rename to media/webrtc/trunk/webrtc/build/android/ant/sdk-targets.xml
rename from media/webrtc/trunk/build/android/buildbot_fyi_builder.sh
rename to media/webrtc/trunk/webrtc/build/android/buildbot_fyi_builder.sh
rename from media/webrtc/trunk/build/android/buildbot_fyi_tester.sh
rename to media/webrtc/trunk/webrtc/build/android/buildbot_fyi_tester.sh
rename from media/webrtc/trunk/build/android/buildbot_main.sh
rename to media/webrtc/trunk/webrtc/build/android/buildbot_main.sh
rename from media/webrtc/trunk/build/android/buildbot_try_builder.sh
rename to media/webrtc/trunk/webrtc/build/android/buildbot_try_builder.sh
rename from media/webrtc/trunk/build/android/buildbot_try_compile.sh
rename to media/webrtc/trunk/webrtc/build/android/buildbot_try_compile.sh
rename from media/webrtc/trunk/build/android/buildbot_try_tester.sh
rename to media/webrtc/trunk/webrtc/build/android/buildbot_try_tester.sh
rename from media/webrtc/trunk/build/android/buildbot_webkit_main.sh
rename to media/webrtc/trunk/webrtc/build/android/buildbot_webkit_main.sh
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/android/cpufeatures.gypi
@@ -0,0 +1,6 @@
+# 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/.
+
+#dummy gypi: contents should be discarded due to an enclosing 'conditions:' element.
+{}
rename from media/webrtc/trunk/build/android/device_stats_monitor.py
rename to media/webrtc/trunk/webrtc/build/android/device_stats_monitor.py
rename from media/webrtc/trunk/build/android/device_status_check.py
rename to media/webrtc/trunk/webrtc/build/android/device_status_check.py
rename from media/webrtc/trunk/build/android/emulator.py
rename to media/webrtc/trunk/webrtc/build/android/emulator.py
rename from media/webrtc/trunk/build/android/enable_asserts.py
rename to media/webrtc/trunk/webrtc/build/android/enable_asserts.py
rename from media/webrtc/trunk/build/android/envsetup.sh
rename to media/webrtc/trunk/webrtc/build/android/envsetup.sh
rename from media/webrtc/trunk/build/android/envsetup_functions.sh
rename to media/webrtc/trunk/webrtc/build/android/envsetup_functions.sh
rename from media/webrtc/trunk/build/android/gdb_apk
rename to media/webrtc/trunk/webrtc/build/android/gdb_apk
rename from media/webrtc/trunk/build/android/gdb_content_shell
rename to media/webrtc/trunk/webrtc/build/android/gdb_content_shell
rename from media/webrtc/trunk/build/android/gtest_filter/base_unittests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/base_unittests_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/base_unittests_emulator_additional_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/base_unittests_emulator_additional_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/content_unittests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/content_unittests_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/ipc_tests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/ipc_tests_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/media_unittests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/media_unittests_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/net_unittests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/net_unittests_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/sync_unit_tests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/sync_unit_tests_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/ui_unittests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/ui_unittests_disabled
rename from media/webrtc/trunk/build/android/gtest_filter/unit_tests_disabled
rename to media/webrtc/trunk/webrtc/build/android/gtest_filter/unit_tests_disabled
rename from media/webrtc/trunk/build/android/lighttpd_server.py
rename to media/webrtc/trunk/webrtc/build/android/lighttpd_server.py
rename from media/webrtc/trunk/build/android/pylib/__init__.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/__init__.py
rename from media/webrtc/trunk/build/android/pylib/android_commands.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/android_commands.py
rename from media/webrtc/trunk/build/android/pylib/apk_info.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/apk_info.py
rename from media/webrtc/trunk/build/android/pylib/base_test_runner.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/base_test_runner.py
rename from media/webrtc/trunk/build/android/pylib/base_test_sharder.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/base_test_sharder.py
rename from media/webrtc/trunk/build/android/pylib/buildbot_report.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/buildbot_report.py
rename from media/webrtc/trunk/build/android/pylib/chrome_test_server_spawner.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/chrome_test_server_spawner.py
rename from media/webrtc/trunk/build/android/pylib/cmd_helper.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/cmd_helper.py
rename from media/webrtc/trunk/build/android/pylib/constants.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/constants.py
rename from media/webrtc/trunk/build/android/pylib/debug_info.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/debug_info.py
rename from media/webrtc/trunk/build/android/pylib/device_stats_monitor.html
rename to media/webrtc/trunk/webrtc/build/android/pylib/device_stats_monitor.html
rename from media/webrtc/trunk/build/android/pylib/device_stats_monitor.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/device_stats_monitor.py
rename from media/webrtc/trunk/build/android/pylib/fake_dns.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/fake_dns.py
rename from media/webrtc/trunk/build/android/pylib/flag_changer.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/flag_changer.py
rename from media/webrtc/trunk/build/android/pylib/forwarder.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/forwarder.py
rename from media/webrtc/trunk/build/android/pylib/io_stats_parser.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/io_stats_parser.py
rename from media/webrtc/trunk/build/android/pylib/java_unittest_utils.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/java_unittest_utils.py
rename from media/webrtc/trunk/build/android/pylib/json_perf_parser.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/json_perf_parser.py
rename from media/webrtc/trunk/build/android/pylib/perf_tests_helper.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/perf_tests_helper.py
rename from media/webrtc/trunk/build/android/pylib/ports.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/ports.py
rename from media/webrtc/trunk/build/android/pylib/python_test_base.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/python_test_base.py
rename from media/webrtc/trunk/build/android/pylib/python_test_caller.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/python_test_caller.py
rename from media/webrtc/trunk/build/android/pylib/python_test_sharder.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/python_test_sharder.py
rename from media/webrtc/trunk/build/android/pylib/run_java_tests.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/run_java_tests.py
rename from media/webrtc/trunk/build/android/pylib/run_python_tests.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/run_python_tests.py
rename from media/webrtc/trunk/build/android/pylib/run_tests_helper.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/run_tests_helper.py
rename from media/webrtc/trunk/build/android/pylib/sharded_tests_queue.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/sharded_tests_queue.py
rename from media/webrtc/trunk/build/android/pylib/single_test_runner.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/single_test_runner.py
rename from media/webrtc/trunk/build/android/pylib/test_info_collection.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/test_info_collection.py
rename from media/webrtc/trunk/build/android/pylib/test_options_parser.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/test_options_parser.py
rename from media/webrtc/trunk/build/android/pylib/test_package.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/test_package.py
rename from media/webrtc/trunk/build/android/pylib/test_package_apk.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/test_package_apk.py
rename from media/webrtc/trunk/build/android/pylib/test_package_executable.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/test_package_executable.py
rename from media/webrtc/trunk/build/android/pylib/test_result.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/test_result.py
rename from media/webrtc/trunk/build/android/pylib/tests_annotations.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/tests_annotations.py
rename from media/webrtc/trunk/build/android/pylib/valgrind_tools.py
rename to media/webrtc/trunk/webrtc/build/android/pylib/valgrind_tools.py
rename from media/webrtc/trunk/build/android/run_instrumentation_tests.py
rename to media/webrtc/trunk/webrtc/build/android/run_instrumentation_tests.py
rename from media/webrtc/trunk/build/android/run_tests.py
rename to media/webrtc/trunk/webrtc/build/android/run_tests.py
rename from media/webrtc/trunk/build/apply_locales.py
rename to media/webrtc/trunk/webrtc/build/apply_locales.py
rename from media/webrtc/trunk/build/args/OWNERS
rename to media/webrtc/trunk/webrtc/build/args/OWNERS
rename from media/webrtc/trunk/build/args/README.txt
rename to media/webrtc/trunk/webrtc/build/args/README.txt
rename from media/webrtc/trunk/build/args/headless.gn
rename to media/webrtc/trunk/webrtc/build/args/headless.gn
rename from media/webrtc/trunk/build/asan.saves
rename to media/webrtc/trunk/webrtc/build/asan.saves
rename from media/webrtc/trunk/build/branding_value.sh
rename to media/webrtc/trunk/webrtc/build/branding_value.sh
rename from media/webrtc/trunk/build/build-ctags.sh
rename to media/webrtc/trunk/webrtc/build/build-ctags.sh
rename from media/webrtc/trunk/build/build_config.h
rename to media/webrtc/trunk/webrtc/build/build_config.h
rename from media/webrtc/trunk/build/buildflag.h
rename to media/webrtc/trunk/webrtc/build/buildflag.h
rename from media/webrtc/trunk/build/buildflag_header.gni
rename to media/webrtc/trunk/webrtc/build/buildflag_header.gni
rename from media/webrtc/trunk/build/check_gn_headers.py
rename to media/webrtc/trunk/webrtc/build/check_gn_headers.py
rename from media/webrtc/trunk/build/check_gn_headers_unittest.py
rename to media/webrtc/trunk/webrtc/build/check_gn_headers_unittest.py
rename from media/webrtc/trunk/build/check_return_value.py
rename to media/webrtc/trunk/webrtc/build/check_return_value.py
rename from media/webrtc/trunk/build/clobber.py
rename to media/webrtc/trunk/webrtc/build/clobber.py
rename from media/webrtc/trunk/build/common.croc
rename to media/webrtc/trunk/webrtc/build/common.croc
rename from media/webrtc/trunk/build/compiled_action.gni
rename to media/webrtc/trunk/webrtc/build/compiled_action.gni
rename from media/webrtc/trunk/build/compiler_version.py
rename to media/webrtc/trunk/webrtc/build/compiler_version.py
rename from media/webrtc/trunk/build/config/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/BUILD.gn
--- a/media/webrtc/trunk/build/config/BUILD.gn
+++ b/media/webrtc/trunk/webrtc/build/config/BUILD.gn
@@ -18,17 +18,17 @@ declare_args() {
   # Iterator debugging is always off in release builds (technically, this flag
   # affects the "debug" config, which is always available but applied by
   # default only in debug builds).
   #
   # Iterator debugging is generally useful for catching bugs. But it can
   # introduce extra locking to check the state of an iterator against the state
   # of the current object. For iterator- and thread-heavy code, this can
   # significantly slow execution.
-  enable_iterator_debugging = true 
+  enable_iterator_debugging = true
 }
 
 # ==============================================
 #   PLEASE DO NOT ADD MORE THINGS TO THIS LIST
 # ==============================================
 #
 # Legacy feature defines applied to all targets.
 #
rename from media/webrtc/trunk/build/config/BUILDCONFIG.gn
rename to media/webrtc/trunk/webrtc/build/config/BUILDCONFIG.gn
rename from media/webrtc/trunk/build/config/OWNERS
rename to media/webrtc/trunk/webrtc/build/config/OWNERS
rename from media/webrtc/trunk/build/config/aix/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/aix/BUILD.gn
rename from media/webrtc/trunk/build/config/allocator.gni
rename to media/webrtc/trunk/webrtc/build/config/allocator.gni
rename from media/webrtc/trunk/build/config/android/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/android/BUILD.gn
rename from media/webrtc/trunk/build/config/android/OWNERS
rename to media/webrtc/trunk/webrtc/build/config/android/OWNERS
rename from media/webrtc/trunk/build/config/android/config.gni
rename to media/webrtc/trunk/webrtc/build/config/android/config.gni
rename from media/webrtc/trunk/build/config/android/internal_rules.gni
rename to media/webrtc/trunk/webrtc/build/config/android/internal_rules.gni
rename from media/webrtc/trunk/build/config/android/rules.gni
rename to media/webrtc/trunk/webrtc/build/config/android/rules.gni
rename from media/webrtc/trunk/build/config/arm.gni
rename to media/webrtc/trunk/webrtc/build/config/arm.gni
rename from media/webrtc/trunk/build/config/chrome_build.gni
rename to media/webrtc/trunk/webrtc/build/config/chrome_build.gni
rename from media/webrtc/trunk/build/config/chromecast/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/chromecast/BUILD.gn
rename from media/webrtc/trunk/build/config/chromecast_build.gni
rename to media/webrtc/trunk/webrtc/build/config/chromecast_build.gni
rename from media/webrtc/trunk/build/config/clang/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/clang/BUILD.gn
rename from media/webrtc/trunk/build/config/clang/clang.gni
rename to media/webrtc/trunk/webrtc/build/config/clang/clang.gni
rename from media/webrtc/trunk/build/config/compiler/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/compiler/BUILD.gn
rename from media/webrtc/trunk/build/config/compiler/compiler.gni
rename to media/webrtc/trunk/webrtc/build/config/compiler/compiler.gni
rename from media/webrtc/trunk/build/config/compiler/pgo/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/compiler/pgo/BUILD.gn
rename from media/webrtc/trunk/build/config/compiler/pgo/pgo.gni
rename to media/webrtc/trunk/webrtc/build/config/compiler/pgo/pgo.gni
rename from media/webrtc/trunk/build/config/crypto.gni
rename to media/webrtc/trunk/webrtc/build/config/crypto.gni
rename from media/webrtc/trunk/build/config/dcheck_always_on.gni
rename to media/webrtc/trunk/webrtc/build/config/dcheck_always_on.gni
rename from media/webrtc/trunk/build/config/features.gni
rename to media/webrtc/trunk/webrtc/build/config/features.gni
rename from media/webrtc/trunk/build/config/freetype/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/freetype/BUILD.gn
rename from media/webrtc/trunk/build/config/freetype/OWNERS
rename to media/webrtc/trunk/webrtc/build/config/freetype/OWNERS
rename from media/webrtc/trunk/build/config/freetype/freetype.gni
rename to media/webrtc/trunk/webrtc/build/config/freetype/freetype.gni
rename from media/webrtc/trunk/build/config/fuchsia/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/fuchsia/BUILD.gn
rename from media/webrtc/trunk/build/config/fuchsia/OWNERS
rename to media/webrtc/trunk/webrtc/build/config/fuchsia/OWNERS
rename from media/webrtc/trunk/build/config/fuchsia/config.gni
rename to media/webrtc/trunk/webrtc/build/config/fuchsia/config.gni
rename from media/webrtc/trunk/build/config/gcc/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/gcc/BUILD.gn
rename from media/webrtc/trunk/build/config/get_host_byteorder.py
rename to media/webrtc/trunk/webrtc/build/config/get_host_byteorder.py
rename from media/webrtc/trunk/build/config/host_byteorder.gni
rename to media/webrtc/trunk/webrtc/build/config/host_byteorder.gni
rename from media/webrtc/trunk/build/config/ios/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/ios/BUILD.gn
rename from media/webrtc/trunk/build/config/ios/BuildInfo.plist
rename to media/webrtc/trunk/webrtc/build/config/ios/BuildInfo.plist
rename from media/webrtc/trunk/build/config/ios/Host-Info.plist
rename to media/webrtc/trunk/webrtc/build/config/ios/Host-Info.plist
rename from media/webrtc/trunk/build/config/ios/Module-Info.plist
rename to media/webrtc/trunk/webrtc/build/config/ios/Module-Info.plist
rename from media/webrtc/trunk/build/config/ios/OWNERS
rename to media/webrtc/trunk/webrtc/build/config/ios/OWNERS
rename from media/webrtc/trunk/build/config/ios/codesign.py
rename to media/webrtc/trunk/webrtc/build/config/ios/codesign.py
rename from media/webrtc/trunk/build/config/ios/entitlements.plist
rename to media/webrtc/trunk/webrtc/build/config/ios/entitlements.plist
rename from media/webrtc/trunk/build/config/ios/find_signing_identity.py
rename to media/webrtc/trunk/webrtc/build/config/ios/find_signing_identity.py
rename from media/webrtc/trunk/build/config/ios/ios_sdk.gni
rename to media/webrtc/trunk/webrtc/build/config/ios/ios_sdk.gni
rename from media/webrtc/trunk/build/config/ios/rules.gni
rename to media/webrtc/trunk/webrtc/build/config/ios/rules.gni
rename from media/webrtc/trunk/build/config/ios/write_framework_hmap.py
rename to media/webrtc/trunk/webrtc/build/config/ios/write_framework_hmap.py
rename from media/webrtc/trunk/build/config/ios/write_framework_modulemap.py
rename to media/webrtc/trunk/webrtc/build/config/ios/write_framework_modulemap.py
rename from media/webrtc/trunk/build/config/ios/xctest_shell.mm
rename to media/webrtc/trunk/webrtc/build/config/ios/xctest_shell.mm
rename from media/webrtc/trunk/build/config/linux/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/atk/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/atk/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/dbus/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/dbus/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/gconf/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/gconf/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/gtk/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/gtk/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/gtk/gtk.gni
rename to media/webrtc/trunk/webrtc/build/config/linux/gtk/gtk.gni
rename from media/webrtc/trunk/build/config/linux/gtk2/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/gtk2/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/gtk3/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/gtk3/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/libffi/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/libffi/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/pangocairo/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/linux/pangocairo/BUILD.gn
rename from media/webrtc/trunk/build/config/linux/pkg-config.py
rename to media/webrtc/trunk/webrtc/build/config/linux/pkg-config.py
rename from media/webrtc/trunk/build/config/linux/pkg_config.gni
rename to media/webrtc/trunk/webrtc/build/config/linux/pkg_config.gni
rename from media/webrtc/trunk/build/config/locales.gni
rename to media/webrtc/trunk/webrtc/build/config/locales.gni
rename from media/webrtc/trunk/build/config/mac/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/mac/BUILD.gn
rename from media/webrtc/trunk/build/config/mac/BuildInfo.plist
rename to media/webrtc/trunk/webrtc/build/config/mac/BuildInfo.plist
rename from media/webrtc/trunk/build/config/mac/OWNERS
rename to media/webrtc/trunk/webrtc/build/config/mac/OWNERS
rename from media/webrtc/trunk/build/config/mac/base_rules.gni
rename to media/webrtc/trunk/webrtc/build/config/mac/base_rules.gni
rename from media/webrtc/trunk/build/config/mac/compile_ib_files.py
rename to media/webrtc/trunk/webrtc/build/config/mac/compile_ib_files.py
rename from media/webrtc/trunk/build/config/mac/mac_sdk.gni
rename to media/webrtc/trunk/webrtc/build/config/mac/mac_sdk.gni
rename from media/webrtc/trunk/build/config/mac/package_framework.py
rename to media/webrtc/trunk/webrtc/build/config/mac/package_framework.py
rename from media/webrtc/trunk/build/config/mac/plist_util.py
rename to media/webrtc/trunk/webrtc/build/config/mac/plist_util.py
rename from media/webrtc/trunk/build/config/mac/prepare_framework_version.py
rename to media/webrtc/trunk/webrtc/build/config/mac/prepare_framework_version.py
rename from media/webrtc/trunk/build/config/mac/rules.gni
rename to media/webrtc/trunk/webrtc/build/config/mac/rules.gni
rename from media/webrtc/trunk/build/config/mac/sdk_info.py
rename to media/webrtc/trunk/webrtc/build/config/mac/sdk_info.py
rename from media/webrtc/trunk/build/config/mac/symbols.gni
rename to media/webrtc/trunk/webrtc/build/config/mac/symbols.gni
rename from media/webrtc/trunk/build/config/mac/write_pkg_info.py
rename to media/webrtc/trunk/webrtc/build/config/mac/write_pkg_info.py
rename from media/webrtc/trunk/build/config/mac/xcrun.py
rename to media/webrtc/trunk/webrtc/build/config/mac/xcrun.py
rename from media/webrtc/trunk/build/config/mips.gni
rename to media/webrtc/trunk/webrtc/build/config/mips.gni
rename from media/webrtc/trunk/build/config/nacl/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/nacl/BUILD.gn
rename from media/webrtc/trunk/build/config/nacl/config.gni
rename to media/webrtc/trunk/webrtc/build/config/nacl/config.gni
rename from media/webrtc/trunk/build/config/nacl/rules.gni
rename to media/webrtc/trunk/webrtc/build/config/nacl/rules.gni
rename from media/webrtc/trunk/build/config/pch.gni
rename to media/webrtc/trunk/webrtc/build/config/pch.gni
rename from media/webrtc/trunk/build/config/posix/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/posix/BUILD.gn
rename from media/webrtc/trunk/build/config/posix/sysroot_ld_path.py
rename to media/webrtc/trunk/webrtc/build/config/posix/sysroot_ld_path.py
rename from media/webrtc/trunk/build/config/sanitizers/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/sanitizers/BUILD.gn
rename from media/webrtc/trunk/build/config/sanitizers/OWNERS
rename to media/webrtc/trunk/webrtc/build/config/sanitizers/OWNERS
rename from media/webrtc/trunk/build/config/sanitizers/sanitizers.gni
rename to media/webrtc/trunk/webrtc/build/config/sanitizers/sanitizers.gni
rename from media/webrtc/trunk/build/config/sysroot.gni
rename to media/webrtc/trunk/webrtc/build/config/sysroot.gni
rename from media/webrtc/trunk/build/config/ui.gni
rename to media/webrtc/trunk/webrtc/build/config/ui.gni
rename from media/webrtc/trunk/build/config/v8_target_cpu.gni
rename to media/webrtc/trunk/webrtc/build/config/v8_target_cpu.gni
rename from media/webrtc/trunk/build/config/win/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/config/win/BUILD.gn
rename from media/webrtc/trunk/build/config/win/console_app.gni
rename to media/webrtc/trunk/webrtc/build/config/win/console_app.gni
rename from media/webrtc/trunk/build/config/win/manifest.gni
rename to media/webrtc/trunk/webrtc/build/config/win/manifest.gni
rename from media/webrtc/trunk/build/config/win/visual_studio_version.gni
rename to media/webrtc/trunk/webrtc/build/config/win/visual_studio_version.gni
rename from media/webrtc/trunk/build/config/zip.gni
rename to media/webrtc/trunk/webrtc/build/config/zip.gni
rename from media/webrtc/trunk/build/copy_test_data_ios.py
rename to media/webrtc/trunk/webrtc/build/copy_test_data_ios.py
rename from media/webrtc/trunk/build/cp.py
rename to media/webrtc/trunk/webrtc/build/cp.py
rename from media/webrtc/trunk/build/detect_host_arch.py
rename to media/webrtc/trunk/webrtc/build/detect_host_arch.py
rename from media/webrtc/trunk/build/dir_exists.py
rename to media/webrtc/trunk/webrtc/build/dir_exists.py
rename from media/webrtc/trunk/build/docs/mac_hermetic_toolchain.md
rename to media/webrtc/trunk/webrtc/build/docs/mac_hermetic_toolchain.md
rename from media/webrtc/trunk/build/dotfile_settings.gni
rename to media/webrtc/trunk/webrtc/build/dotfile_settings.gni
rename from media/webrtc/trunk/build/download_gold_plugin.py
rename to media/webrtc/trunk/webrtc/build/download_gold_plugin.py
rename from media/webrtc/trunk/build/download_nacl_toolchains.py
rename to media/webrtc/trunk/webrtc/build/download_nacl_toolchains.py
rename from media/webrtc/trunk/build/download_translation_unit_tool.py
rename to media/webrtc/trunk/webrtc/build/download_translation_unit_tool.py
rename from media/webrtc/trunk/build/env_dump.py
rename to media/webrtc/trunk/webrtc/build/env_dump.py
rename from media/webrtc/trunk/build/escape_unicode.py
rename to media/webrtc/trunk/webrtc/build/escape_unicode.py
rename from media/webrtc/trunk/build/experimental/install-build-deps.py
rename to media/webrtc/trunk/webrtc/build/experimental/install-build-deps.py
rename from media/webrtc/trunk/build/extract_from_cab.py
rename to media/webrtc/trunk/webrtc/build/extract_from_cab.py
rename from media/webrtc/trunk/build/find_depot_tools.py
rename to media/webrtc/trunk/webrtc/build/find_depot_tools.py
rename from media/webrtc/trunk/build/find_isolated_tests.py
rename to media/webrtc/trunk/webrtc/build/find_isolated_tests.py
rename from media/webrtc/trunk/build/fix_gn_headers.py
rename to media/webrtc/trunk/webrtc/build/fix_gn_headers.py
rename from media/webrtc/trunk/build/fuchsia/update_sdk.py
rename to media/webrtc/trunk/webrtc/build/fuchsia/update_sdk.py
rename from media/webrtc/trunk/build/gdb-add-index
rename to media/webrtc/trunk/webrtc/build/gdb-add-index
rename from media/webrtc/trunk/build/get_landmines.py
rename to media/webrtc/trunk/webrtc/build/get_landmines.py
rename from media/webrtc/trunk/build/get_syzygy_binaries.py
rename to media/webrtc/trunk/webrtc/build/get_syzygy_binaries.py
rename from media/webrtc/trunk/build/git-hooks/OWNERS
rename to media/webrtc/trunk/webrtc/build/git-hooks/OWNERS
rename from media/webrtc/trunk/build/git-hooks/pre-commit
rename to media/webrtc/trunk/webrtc/build/git-hooks/pre-commit
rename from media/webrtc/trunk/build/gn_helpers.py
rename to media/webrtc/trunk/webrtc/build/gn_helpers.py
rename from media/webrtc/trunk/build/gn_helpers_unittest.py
rename to media/webrtc/trunk/webrtc/build/gn_helpers_unittest.py
rename from media/webrtc/trunk/build/gn_run_binary.py
rename to media/webrtc/trunk/webrtc/build/gn_run_binary.py
new file mode 100755
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/gyp_chromium
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Simple launcher script for gyp_chromium.py.
+# TODO(sbc): This should probably be shell script but for historical
+# reasons (all the python code used to live in this script without a
+# .py extension, and was often run as 'python gyp_chromium') it is
+# currently still python.
+
+execfile(__file__ + '.py')
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/gyp_chromium.py
@@ -0,0 +1,68 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""This script is now only used by the closure_compilation builders."""
+
+import argparse
+import glob
+import gyp_environment
+import os
+import shlex
+import sys
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
+
+sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
+import gyp
+
+
+def ProcessGypDefinesItems(items):
+  """Converts a list of strings to a list of key-value pairs."""
+  result = []
+  for item in items:
+    tokens = item.split('=', 1)
+    # Some GYP variables have hyphens, which we don't support.
+    if len(tokens) == 2:
+      result += [(tokens[0], tokens[1])]
+    else:
+      # No value supplied, treat it as a boolean and set it. Note that we
+      # use the string '1' here so we have a consistent definition whether
+      # you do 'foo=1' or 'foo'.
+      result += [(tokens[0], '1')]
+  return result
+
+
+def GetSupplementalFiles():
+  return []
+
+
+def GetGypVars(_):
+  """Returns a dictionary of all GYP vars."""
+  # GYP defines from the environment.
+  env_items = ProcessGypDefinesItems(
+      shlex.split(os.environ.get('GYP_DEFINES', '')))
+
+  # GYP defines from the command line.
+  parser = argparse.ArgumentParser()
+  parser.add_argument('-D', dest='defines', action='append', default=[])
+  cmdline_input_items = parser.parse_known_args()[0].defines
+  cmdline_items = ProcessGypDefinesItems(cmdline_input_items)
+
+  return dict(env_items + cmdline_items)
+
+
+def main():
+  gyp_environment.SetEnvironment()
+
+  print 'Updating projects from gyp files...'
+  sys.stdout.flush()
+  sys.exit(gyp.main(sys.argv[1:] + [
+      '--check',
+      '--no-circular-check',
+      '-I', os.path.join(script_dir, 'common.gypi'),
+      '-D', 'gyp_output_dir=out']))
+
+if __name__ == '__main__':
+  sys.exit(main())
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/gyp_environment.py
@@ -0,0 +1,30 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+Sets up various automatic gyp environment variables. These are used by
+gyp_chromium and landmines.py which run at different stages of runhooks. To
+make sure settings are consistent between them, all setup should happen here.
+"""
+
+import gyp_helper
+import os
+import sys
+import vs_toolchain
+
+def SetEnvironment():
+  """Sets defaults for GYP_* variables."""
+  gyp_helper.apply_chromium_gyp_env()
+
+  # Default to ninja on linux and windows, but only if no generator has
+  # explicitly been set.
+  # Also default to ninja on mac, but only when not building chrome/ios.
+  # . -f / --format has precedence over the env var, no need to check for it
+  # . set the env var only if it hasn't been set yet
+  # . chromium.gyp_env has been applied to os.environ at this point already
+  if sys.platform.startswith(('linux', 'win', 'freebsd', 'darwin')) and \
+      not os.environ.get('GYP_GENERATORS'):
+    os.environ['GYP_GENERATORS'] = 'ninja'
+
+  vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/gyp_helper.py
@@ -0,0 +1,68 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file helps gyp_chromium and landmines correctly set up the gyp
+# environment from chromium.gyp_env on disk
+
+import os
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+CHROME_SRC = os.path.dirname(SCRIPT_DIR)
+
+
+def apply_gyp_environment_from_file(file_path):
+  """Reads in a *.gyp_env file and applies the valid keys to os.environ."""
+  if not os.path.exists(file_path):
+    return
+  with open(file_path, 'rU') as f:
+    file_contents = f.read()
+  try:
+    file_data = eval(file_contents, {'__builtins__': None}, None)
+  except SyntaxError, e:
+    e.filename = os.path.abspath(file_path)
+    raise
+  supported_vars = (
+      'CC',
+      'CC_wrapper',
+      'CC.host_wrapper',
+      'CHROMIUM_GYP_FILE',
+      'CHROMIUM_GYP_SYNTAX_CHECK',
+      'CXX',
+      'CXX_wrapper',
+      'CXX.host_wrapper',
+      'GYP_DEFINES',
+      'GYP_GENERATOR_FLAGS',
+      'GYP_CROSSCOMPILE',
+      'GYP_GENERATOR_OUTPUT',
+      'GYP_GENERATORS',
+      'GYP_INCLUDE_FIRST',
+      'GYP_INCLUDE_LAST',
+      'GYP_MSVS_VERSION',
+  )
+  for var in supported_vars:
+    file_val = file_data.get(var)
+    if file_val:
+      if var in os.environ:
+        behavior = 'replaces'
+        if var == 'GYP_DEFINES':
+          result = file_val + ' ' + os.environ[var]
+          behavior = 'merges with, and individual components override,'
+        else:
+          result = os.environ[var]
+        print 'INFO: Environment value for "%s" %s value in %s' % (
+            var, behavior, os.path.abspath(file_path)
+        )
+        string_padding = max(len(var), len(file_path), len('result'))
+        print '      %s: %s' % (var.rjust(string_padding), os.environ[var])
+        print '      %s: %s' % (file_path.rjust(string_padding), file_val)
+        os.environ[var] = result
+      else:
+        os.environ[var] = file_val
+
+
+def apply_chromium_gyp_env():
+  if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ:
+    # Update the environment based on chromium.gyp_env
+    path = os.path.join(os.path.dirname(CHROME_SRC), 'chromium.gyp_env')
+    apply_gyp_environment_from_file(path)
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/gypi_to_gn.py
@@ -0,0 +1,191 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Converts a given gypi file to a python scope and writes the result to stdout.
+
+USING THIS SCRIPT IN CHROMIUM
+
+Forking Python to run this script in the middle of GN is slow, especially on
+Windows, and it makes both the GYP and GN files harder to follow. You can't
+use "git grep" to find files in the GN build any more, and tracking everything
+in GYP down requires a level of indirection. Any calls will have to be removed
+and cleaned up once the GYP-to-GN transition is complete.
+
+As a result, we only use this script when the list of files is large and
+frequently-changing. In these cases, having one canonical list outweights the
+downsides.
+
+As of this writing, the GN build is basically complete. It's likely that all
+large and frequently changing targets where this is appropriate use this
+mechanism already. And since we hope to turn down the GYP build soon, the time
+horizon is also relatively short. As a result, it is likely that no additional
+uses of this script should every be added to the build. During this later part
+of the transition period, we should be focusing more and more on the absolute
+readability of the GN build.
+
+
+HOW TO USE
+
+It is assumed that the file contains a toplevel dictionary, and this script
+will return that dictionary as a GN "scope" (see example below). This script
+does not know anything about GYP and it will not expand variables or execute
+conditions.
+
+It will strip conditions blocks.
+
+A variables block at the top level will be flattened so that the variables
+appear in the root dictionary. This way they can be returned to the GN code.
+
+Say your_file.gypi looked like this:
+  {
+     'sources': [ 'a.cc', 'b.cc' ],
+     'defines': [ 'ENABLE_DOOM_MELON' ],
+  }
+
+You would call it like this:
+  gypi_values = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("your_file.gypi") ],
+                            "scope",
+                            [ "your_file.gypi" ])
+
+Notes:
+ - The rebase_path call converts the gypi file from being relative to the
+   current build file to being system absolute for calling the script, which
+   will have a different current directory than this file.
+
+ - The "scope" parameter tells GN to interpret the result as a series of GN
+   variable assignments.
+
+ - The last file argument to exec_script tells GN that the given file is a
+   dependency of the build so Ninja can automatically re-run GN if the file
+   changes.
+
+Read the values into a target like this:
+  component("mycomponent") {
+    sources = gypi_values.sources
+    defines = gypi_values.defines
+  }
+
+Sometimes your .gypi file will include paths relative to a different
+directory than the current .gn file. In this case, you can rebase them to
+be relative to the current directory.
+  sources = rebase_path(gypi_values.sources, ".",
+                        "//path/gypi/input/values/are/relative/to")
+
+This script will tolerate a 'variables' in the toplevel dictionary or not. If
+the toplevel dictionary just contains one item called 'variables', it will be
+collapsed away and the result will be the contents of that dictinoary. Some
+.gypi files are written with or without this, depending on how they expect to
+be embedded into a .gyp file.
+
+This script also has the ability to replace certain substrings in the input.
+Generally this is used to emulate GYP variable expansion. If you passed the
+argument "--replace=<(foo)=bar" then all instances of "<(foo)" in strings in
+the input will be replaced with "bar":
+
+  gypi_values = exec_script("//build/gypi_to_gn.py",
+                            [ rebase_path("your_file.gypi"),
+                              "--replace=<(foo)=bar"],
+                            "scope",
+                            [ "your_file.gypi" ])
+
+"""
+
+import gn_helpers
+from optparse import OptionParser
+import sys
+
+def LoadPythonDictionary(path):
+  file_string = open(path).read()
+  try:
+    file_data = eval(file_string, {'__builtins__': None}, None)
+  except SyntaxError, e:
+    e.filename = path
+    raise
+  except Exception, e:
+    raise Exception("Unexpected error while reading %s: %s" % (path, str(e)))
+
+  assert isinstance(file_data, dict), "%s does not eval to a dictionary" % path
+
+  # Flatten any variables to the top level.
+  if 'variables' in file_data:
+    file_data.update(file_data['variables'])
+    del file_data['variables']
+
+  # Strip all elements that this script can't process.
+  elements_to_strip = [
+    'conditions',
+    'target_conditions',
+    'targets',
+    'includes',
+    'actions',
+  ]
+  for element in elements_to_strip:
+    if element in file_data:
+      del file_data[element]
+
+  return file_data
+
+
+def ReplaceSubstrings(values, search_for, replace_with):
+  """Recursively replaces substrings in a value.
+
+  Replaces all substrings of the "search_for" with "repace_with" for all
+  strings occurring in "values". This is done by recursively iterating into
+  lists as well as the keys and values of dictionaries."""
+  if isinstance(values, str):
+    return values.replace(search_for, replace_with)
+
+  if isinstance(values, list):
+    return [ReplaceSubstrings(v, search_for, replace_with) for v in values]
+
+  if isinstance(values, dict):
+    # For dictionaries, do the search for both the key and values.
+    result = {}
+    for key, value in values.items():
+      new_key = ReplaceSubstrings(key, search_for, replace_with)
+      new_value = ReplaceSubstrings(value, search_for, replace_with)
+      result[new_key] = new_value
+    return result
+
+  # Assume everything else is unchanged.
+  return values
+
+def main():
+  parser = OptionParser()
+  parser.add_option("-r", "--replace", action="append",
+    help="Replaces substrings. If passed a=b, replaces all substrs a with b.")
+  (options, args) = parser.parse_args()
+
+  if len(args) != 1:
+    raise Exception("Need one argument which is the .gypi file to read.")
+
+  data = LoadPythonDictionary(args[0])
+  if options.replace:
+    # Do replacements for all specified patterns.
+    for replace in options.replace:
+      split = replace.split('=')
+      # Allow "foo=" to replace with nothing.
+      if len(split) == 1:
+        split.append('')
+      assert len(split) == 2, "Replacement must be of the form 'key=value'."
+      data = ReplaceSubstrings(data, split[0], split[1])
+
+  # Sometimes .gypi files use the GYP syntax with percents at the end of the
+  # variable name (to indicate not to overwrite a previously-defined value):
+  #   'foo%': 'bar',
+  # Convert these to regular variables.
+  for key in data:
+    if len(key) > 1 and key[len(key) - 1] == '%':
+      data[key[:-1]] = data[key]
+      del data[key]
+
+  print gn_helpers.ToGNString(data)
+
+if __name__ == '__main__':
+  try:
+    main()
+  except Exception, e:
+    print str(e)
+    sys.exit(1)
rename from media/webrtc/trunk/build/install-build-deps-android.sh
rename to media/webrtc/trunk/webrtc/build/install-build-deps-android.sh
rename from media/webrtc/trunk/build/install-build-deps.sh
rename to media/webrtc/trunk/webrtc/build/install-build-deps.sh
rename from media/webrtc/trunk/build/install-chroot.sh
rename to media/webrtc/trunk/webrtc/build/install-chroot.sh
rename from media/webrtc/trunk/build/inverse_depth.py
rename to media/webrtc/trunk/webrtc/build/inverse_depth.py
rename from media/webrtc/trunk/build/ios/OWNERS
rename to media/webrtc/trunk/webrtc/build/ios/OWNERS
rename from media/webrtc/trunk/build/ios/chrome_ios.croc
rename to media/webrtc/trunk/webrtc/build/ios/chrome_ios.croc
rename from media/webrtc/trunk/build/ios/clean_env.py
rename to media/webrtc/trunk/webrtc/build/ios/clean_env.py
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/ios/mac_build.gypi
@@ -0,0 +1,79 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Xcode throws an error if an iOS target depends on a Mac OS X target. So
+# any place a utility program needs to be build and run, an action is
+# used to run ninja as script to work around this.
+# Example:
+# {
+#   'target_name': 'foo',
+#   'type': 'none',
+#   'variables': {
+#     # The name of a directory used for ninja. This cannot be shared with
+#     # another mac build.
+#     'ninja_output_dir': 'ninja-foo',
+#     # The list of all the gyp files that contain the targets to run.
+#     're_run_targets': [
+#       'foo.gyp',
+#     ],
+#   },
+#   'includes': ['path_to/mac_build.gypi'],
+#   'actions': [
+#     {
+#       'action_name': 'compile foo',
+#       'inputs': [],
+#       'outputs': [],
+#       'action': [
+#         '<@(ninja_cmd)',
+#         # All the targets to build.
+#         'foo1',
+#         'foo2',
+#       ],
+#     },
+#   ],
+# }
+{
+  'variables': {
+    # Convenience variable pointing to the ninja product directory.
+    'ninja_product_dir':
+      '<(DEPTH)/xcodebuild/<(ninja_output_dir)/<(CONFIGURATION_NAME)',
+
+    # Common ninja command line flags.
+    'ninja_cmd': [
+      # Bounce through clean_env to clean up the environment so things
+      # set by the iOS build don't pollute the Mac build.
+      '<(DEPTH)/build/ios/clean_env.py',
+      # ninja must be found in the PATH.
+      'ADD_TO_PATH=<!(echo $PATH)',
+      'ninja',
+      '-C',
+      '<(ninja_product_dir)',
+    ],
+
+    # Common syntax to rerun gyp to generate the Mac projects.
+    're_run_gyp': [
+      'build/gyp_chromium',
+      # Don't use anything set for the iOS side of things.
+      '--ignore-environment',
+      # Generate for ninja
+      '--format=ninja',
+      # Generate files into xcodebuild/ninja
+      '-Goutput_dir=xcodebuild/<(ninja_output_dir)',
+      # nacl isn't in the iOS checkout, make sure it's turned off
+      '-Ddisable_nacl=1',
+      # Add a variable to handle specific cases for mac_build.
+      '-Dios_mac_build=1',
+      # Pass through the Mac SDK version.
+      '-Dmac_sdk=<(mac_sdk)',
+    ],
+
+    # Rerun gyp for each of the projects needed. This is what actually
+    # generates the projects on disk.
+    're_run_gyp_execution':
+      '<!(cd <(DEPTH) && <@(re_run_gyp) <@(re_run_targets))',
+  },
+  # Since these are used to generate things needed by other targets, make
+  # them hard dependencies so they are always built first.
+  'hard_dependency': 1,
+}
rename from media/webrtc/trunk/build/landmine_utils.py
rename to media/webrtc/trunk/webrtc/build/landmine_utils.py
rename from media/webrtc/trunk/build/landmines.py
rename to media/webrtc/trunk/webrtc/build/landmines.py
rename from media/webrtc/trunk/build/mac/OWNERS
rename to media/webrtc/trunk/webrtc/build/mac/OWNERS
rename from media/webrtc/trunk/build/mac/change_mach_o_flags.py
rename to media/webrtc/trunk/webrtc/build/mac/change_mach_o_flags.py
rename from media/webrtc/trunk/build/mac/change_mach_o_flags_from_xcode.sh
rename to media/webrtc/trunk/webrtc/build/mac/change_mach_o_flags_from_xcode.sh
rename from media/webrtc/trunk/build/mac/chrome_mac.croc
rename to media/webrtc/trunk/webrtc/build/mac/chrome_mac.croc
rename from media/webrtc/trunk/build/mac/copy_framework_unversioned.sh
rename to media/webrtc/trunk/webrtc/build/mac/copy_framework_unversioned.sh
rename from media/webrtc/trunk/build/mac/edit_xibs.sh
rename to media/webrtc/trunk/webrtc/build/mac/edit_xibs.sh
old mode 100755
new mode 100644
rename from media/webrtc/trunk/build/mac/find_sdk.py
rename to media/webrtc/trunk/webrtc/build/mac/find_sdk.py
rename from media/webrtc/trunk/build/mac/make_more_helpers.sh
rename to media/webrtc/trunk/webrtc/build/mac/make_more_helpers.sh
rename from media/webrtc/trunk/build/mac/should_use_hermetic_xcode.py
rename to media/webrtc/trunk/webrtc/build/mac/should_use_hermetic_xcode.py
rename from media/webrtc/trunk/build/mac/strip_from_xcode
rename to media/webrtc/trunk/webrtc/build/mac/strip_from_xcode
rename from media/webrtc/trunk/build/mac/strip_save_dsym
rename to media/webrtc/trunk/webrtc/build/mac/strip_save_dsym
rename from media/webrtc/trunk/build/mac/tweak_info_plist.gni
rename to media/webrtc/trunk/webrtc/build/mac/tweak_info_plist.gni
rename from media/webrtc/trunk/build/mac/tweak_info_plist.py
rename to media/webrtc/trunk/webrtc/build/mac/tweak_info_plist.py
rename from media/webrtc/trunk/build/mac/verify_no_objc.sh
rename to media/webrtc/trunk/webrtc/build/mac/verify_no_objc.sh
rename from media/webrtc/trunk/build/mac_toolchain.py
rename to media/webrtc/trunk/webrtc/build/mac_toolchain.py
rename from media/webrtc/trunk/build/nocompile.gni
rename to media/webrtc/trunk/webrtc/build/nocompile.gni
rename from media/webrtc/trunk/build/output_dll_copy.rules
rename to media/webrtc/trunk/webrtc/build/output_dll_copy.rules
rename from media/webrtc/trunk/build/package_mac_toolchain.py
rename to media/webrtc/trunk/webrtc/build/package_mac_toolchain.py
rename from media/webrtc/trunk/build/precompile.cc
rename to media/webrtc/trunk/webrtc/build/precompile.cc
rename from media/webrtc/trunk/build/precompile.h
rename to media/webrtc/trunk/webrtc/build/precompile.h
rename from media/webrtc/trunk/build/print_python_deps.py
rename to media/webrtc/trunk/webrtc/build/print_python_deps.py
rename from media/webrtc/trunk/build/protoc_java.py
rename to media/webrtc/trunk/webrtc/build/protoc_java.py
rename from media/webrtc/trunk/build/redirect_stdout.py
rename to media/webrtc/trunk/webrtc/build/redirect_stdout.py
rename from media/webrtc/trunk/build/rm.py
rename to media/webrtc/trunk/webrtc/build/rm.py
rename from media/webrtc/trunk/build/sample_arg_file.gn
rename to media/webrtc/trunk/webrtc/build/sample_arg_file.gn
rename from media/webrtc/trunk/build/sanitize-mac-build-log.sed
rename to media/webrtc/trunk/webrtc/build/sanitize-mac-build-log.sed
rename from media/webrtc/trunk/build/sanitize-mac-build-log.sh
rename to media/webrtc/trunk/webrtc/build/sanitize-mac-build-log.sh
rename from media/webrtc/trunk/build/sanitize-win-build-log.sed
rename to media/webrtc/trunk/webrtc/build/sanitize-win-build-log.sed
rename from media/webrtc/trunk/build/sanitize-win-build-log.sh
rename to media/webrtc/trunk/webrtc/build/sanitize-win-build-log.sh
rename from media/webrtc/trunk/build/sanitizers/OWNERS
rename to media/webrtc/trunk/webrtc/build/sanitizers/OWNERS
rename from media/webrtc/trunk/build/sanitizers/asan_suppressions.cc
rename to media/webrtc/trunk/webrtc/build/sanitizers/asan_suppressions.cc
rename from media/webrtc/trunk/build/sanitizers/lsan_suppressions.cc
rename to media/webrtc/trunk/webrtc/build/sanitizers/lsan_suppressions.cc
rename from media/webrtc/trunk/build/sanitizers/sanitizer_options.cc
rename to media/webrtc/trunk/webrtc/build/sanitizers/sanitizer_options.cc
rename from media/webrtc/trunk/build/sanitizers/tsan_suppressions.cc
rename to media/webrtc/trunk/webrtc/build/sanitizers/tsan_suppressions.cc
rename from media/webrtc/trunk/build/secondary/testing/gmock/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/testing/gmock/BUILD.gn
rename from media/webrtc/trunk/build/secondary/testing/gtest/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/testing/gtest/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/android_platform/development/scripts/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/android_platform/development/scripts/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/android_platform/development/scripts/stack.pydeps
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/android_platform/development/scripts/stack.pydeps
rename from media/webrtc/trunk/build/secondary/third_party/android_tools/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/android_tools/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/android_tools/apk_proguard.flags
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/android_tools/apk_proguard.flags
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/OWNERS
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/OWNERS
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/client/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/client/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/compat/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/compat/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/handler/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/minidump/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/minidump/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/snapshot/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/snapshot/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/third_party/apple_cctools/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/third_party/apple_cctools/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/third_party/getopt/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/third_party/getopt/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/third_party/zlib/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/third_party/zlib/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/tools/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/tools/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/crashpad/crashpad/util/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/crashpad/crashpad/util/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/libjpeg_turbo/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/libjpeg_turbo/BUILD.gn
rename from media/webrtc/trunk/build/secondary/third_party/nss/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/secondary/third_party/nss/BUILD.gn
rename from media/webrtc/trunk/build/shim_headers.gni
rename to media/webrtc/trunk/webrtc/build/shim_headers.gni
rename from media/webrtc/trunk/build/slave/OWNERS
rename to media/webrtc/trunk/webrtc/build/slave/OWNERS
rename from media/webrtc/trunk/build/slave/README
rename to media/webrtc/trunk/webrtc/build/slave/README
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/some.gyp
@@ -0,0 +1,24 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'targets': [
+    {
+      'target_name': 'some',
+      'type': 'none',
+      'dependencies': [
+        # This file is intended to be locally modified. List the targets you use
+        # regularly. The generated some.sln will contains projects for only
+        # those targets and the targets they are transitively dependent on. This
+        # can result in a solution that loads and unloads faster in Visual
+        # Studio.
+        #
+        # Tip: Create a dummy CL to hold your local edits to this file, so they
+        # don't accidentally get added to another CL that you are editing.
+        #
+        # Example:
+        # '../chrome/chrome.gyp:chrome',
+      ],
+    },
+  ],
+}
rename from media/webrtc/trunk/build/split_static_library.gni
rename to media/webrtc/trunk/webrtc/build/split_static_library.gni
rename from media/webrtc/trunk/build/symlink.gni
rename to media/webrtc/trunk/webrtc/build/symlink.gni
rename from media/webrtc/trunk/build/symlink.py
rename to media/webrtc/trunk/webrtc/build/symlink.py
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/temp_gyp/README.chromium
@@ -0,0 +1,3 @@
+This directory will be removed once the files in it are committed upstream and
+Chromium imports an upstream revision with these files.  Contact mark for
+details.
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/temp_gyp/googleurl.gyp
@@ -0,0 +1,105 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# TODO(mark): Upstream this file to googleurl.
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'googleurl',
+      'type': '<(component)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../third_party/icu/icu.gyp:icudata',
+        '../../third_party/icu/icu.gyp:icui18n',
+        '../../third_party/icu/icu.gyp:icuuc',
+      ],
+      'sources': [
+        '../../googleurl/src/gurl.cc',
+        '../../googleurl/src/gurl.h',
+        '../../googleurl/src/url_canon.h',
+        '../../googleurl/src/url_canon_etc.cc',
+        '../../googleurl/src/url_canon_fileurl.cc',
+        '../../googleurl/src/url_canon_filesystemurl.cc',
+        '../../googleurl/src/url_canon_host.cc',
+        '../../googleurl/src/url_canon_icu.cc',
+        '../../googleurl/src/url_canon_icu.h',
+        '../../googleurl/src/url_canon_internal.cc',
+        '../../googleurl/src/url_canon_internal.h',
+        '../../googleurl/src/url_canon_internal_file.h',
+        '../../googleurl/src/url_canon_ip.cc',
+        '../../googleurl/src/url_canon_ip.h',
+        '../../googleurl/src/url_canon_mailtourl.cc',
+        '../../googleurl/src/url_canon_path.cc',
+        '../../googleurl/src/url_canon_pathurl.cc',
+        '../../googleurl/src/url_canon_query.cc',
+        '../../googleurl/src/url_canon_relative.cc',
+        '../../googleurl/src/url_canon_stdstring.h',
+        '../../googleurl/src/url_canon_stdurl.cc',
+        '../../googleurl/src/url_file.h',
+        '../../googleurl/src/url_parse.cc',
+        '../../googleurl/src/url_parse.h',
+        '../../googleurl/src/url_parse_file.cc',
+        '../../googleurl/src/url_parse_internal.h',
+        '../../googleurl/src/url_util.cc',
+        '../../googleurl/src/url_util.h',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../..',
+        ],
+      },
+      'defines': [
+        'FULL_FILESYSTEM_URL_SUPPORT=1',
+      ],
+      'conditions': [
+        ['component=="shared_library"', {
+          'defines': [
+            'GURL_DLL',
+            'GURL_IMPLEMENTATION=1',
+          ],
+          'direct_dependent_settings': {
+            'defines': [
+              'GURL_DLL',
+            ],
+          },
+        }],
+      ],
+    },
+    {
+      'target_name': 'googleurl_unittests',
+      'type': 'executable',
+      'dependencies': [
+        'googleurl',
+        '../../base/base.gyp:base_i18n',
+        '../../base/base.gyp:run_all_unittests',
+        '../../testing/gtest.gyp:gtest',
+        '../../third_party/icu/icu.gyp:icuuc',
+      ],
+      'sources': [
+        '../../googleurl/src/gurl_unittest.cc',
+        '../../googleurl/src/url_canon_unittest.cc',
+        '../../googleurl/src/url_parse_unittest.cc',
+        '../../googleurl/src/url_test_utils.h',
+        '../../googleurl/src/url_util_unittest.cc',
+      ],
+      'defines': [
+        'FULL_FILESYSTEM_URL_SUPPORT=1',
+      ],
+      'conditions': [
+        ['os_posix==1 and OS!="mac" and OS!="ios"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '../../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+      ],
+    },
+  ],
+}
new file mode 100644
--- /dev/null
+++ b/media/webrtc/trunk/webrtc/build/temp_gyp/pdfsqueeze.gyp
@@ -0,0 +1,40 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'pdfsqueeze',
+      'type': 'executable',
+      'sources': [
+        '../../third_party/pdfsqueeze/pdfsqueeze.m',
+      ],
+      'defines': [
+        # Use defines to map the full path names that will be used for
+        # the vars into the short forms expected by pdfsqueeze.m.
+        '______third_party_pdfsqueeze_ApplyGenericRGB_qfilter=ApplyGenericRGB_qfilter',
+        '______third_party_pdfsqueeze_ApplyGenericRGB_qfilter_len=ApplyGenericRGB_qfilter_len',
+      ],
+      'include_dirs': [
+        '<(INTERMEDIATE_DIR)',
+      ],
+      'libraries': [
+        '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+        '$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
+      ],
+      'actions': [
+        {
+          'action_name': 'Generate inline filter data',
+          'inputs': [
+            '../../third_party/pdfsqueeze/ApplyGenericRGB.qfilter',
+          ],
+          'outputs': [
+            '<(INTERMEDIATE_DIR)/ApplyGenericRGB.h',
+          ],
+          'action': ['xxd', '-i', '<@(_inputs)', '<@(_outputs)'],
+        },
+      ],
+    },
+  ],
+}
rename from media/webrtc/trunk/build/toolchain/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/OWNERS
rename to media/webrtc/trunk/webrtc/build/toolchain/OWNERS
rename from media/webrtc/trunk/build/toolchain/aix/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/aix/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/android/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/android/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/cc_wrapper.gni
rename to media/webrtc/trunk/webrtc/build/toolchain/cc_wrapper.gni
rename from media/webrtc/trunk/build/toolchain/clang_static_analyzer.gni
rename to media/webrtc/trunk/webrtc/build/toolchain/clang_static_analyzer.gni
rename from media/webrtc/trunk/build/toolchain/clang_static_analyzer_wrapper.py
rename to media/webrtc/trunk/webrtc/build/toolchain/clang_static_analyzer_wrapper.py
rename from media/webrtc/trunk/build/toolchain/concurrent_links.gni
rename to media/webrtc/trunk/webrtc/build/toolchain/concurrent_links.gni
rename from media/webrtc/trunk/build/toolchain/cros/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/cros/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/cros_toolchain.gni
rename to media/webrtc/trunk/webrtc/build/toolchain/cros_toolchain.gni
rename from media/webrtc/trunk/build/toolchain/fallback/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/fallback/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/fuchsia/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/fuchsia/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/fuchsia/OWNERS
rename to media/webrtc/trunk/webrtc/build/toolchain/fuchsia/OWNERS
rename from media/webrtc/trunk/build/toolchain/gcc_ar_wrapper.py
rename to media/webrtc/trunk/webrtc/build/toolchain/gcc_ar_wrapper.py
rename from media/webrtc/trunk/build/toolchain/gcc_compile_wrapper.py
rename to media/webrtc/trunk/webrtc/build/toolchain/gcc_compile_wrapper.py
rename from media/webrtc/trunk/build/toolchain/gcc_link_wrapper.py
rename to media/webrtc/trunk/webrtc/build/toolchain/gcc_link_wrapper.py
rename from media/webrtc/trunk/build/toolchain/gcc_solink_wrapper.py
rename to media/webrtc/trunk/webrtc/build/toolchain/gcc_solink_wrapper.py
rename from media/webrtc/trunk/build/toolchain/gcc_toolchain.gni
rename to media/webrtc/trunk/webrtc/build/toolchain/gcc_toolchain.gni
rename from media/webrtc/trunk/build/toolchain/get_concurrent_links.py
rename to media/webrtc/trunk/webrtc/build/toolchain/get_concurrent_links.py
rename from media/webrtc/trunk/build/toolchain/goma.gni
rename to media/webrtc/trunk/webrtc/build/toolchain/goma.gni
rename from media/webrtc/trunk/build/toolchain/linux/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/linux/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/mac/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/mac/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/mac/compile_xcassets.py
rename to media/webrtc/trunk/webrtc/build/toolchain/mac/compile_xcassets.py
rename from media/webrtc/trunk/build/toolchain/mac/filter_libtool.py
rename to media/webrtc/trunk/webrtc/build/toolchain/mac/filter_libtool.py
rename from media/webrtc/trunk/build/toolchain/mac/get_tool_mtime.py
rename to media/webrtc/trunk/webrtc/build/toolchain/mac/get_tool_mtime.py
rename from media/webrtc/trunk/build/toolchain/mac/linker_driver.py
rename to media/webrtc/trunk/webrtc/build/toolchain/mac/linker_driver.py
rename from media/webrtc/trunk/build/toolchain/nacl/BUILD.gn
rename to media/webrtc/trunk/webrtc/build/toolchain/nacl/BUILD.gn
rename from media/webrtc/trunk/build/toolchain/nacl_toolchain.gni
rename to medi