Bug 1509994 - Update gn generated json files (part 2); r=pehrsons
authorDan Minor <dminor@mozilla.com>
Tue, 27 Nov 2018 17:33:47 +0000
changeset 507795 cab408925a76ee7c005a122850e75b6864b7638a
parent 507794 6cea864da2b6ae105a22219cf3e166d9d2b9aa31
child 507796 352048c0769370981a78204b5855a35247d3e354
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspehrsons
bugs1509994
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 1509994 - Update gn generated json files (part 2); r=pehrsons Depends on D13094 Differential Revision: https://phabricator.services.mozilla.com/D13095
media/webrtc/gn-configs/arm64_False_arm64_freebsd.json
media/webrtc/gn-configs/arm64_False_arm64_linux.json
media/webrtc/gn-configs/arm64_False_arm64_netbsd.json
media/webrtc/gn-configs/arm64_False_arm64_openbsd.json
media/webrtc/gn-configs/arm64_True_arm64_freebsd.json
media/webrtc/gn-configs/arm64_True_arm64_linux.json
media/webrtc/gn-configs/arm64_True_arm64_netbsd.json
media/webrtc/gn-configs/arm64_True_arm64_openbsd.json
media/webrtc/gn-configs/arm_False_arm_freebsd.json
media/webrtc/gn-configs/arm_False_arm_linux.json
media/webrtc/gn-configs/arm_False_arm_netbsd.json
media/webrtc/gn-configs/arm_False_arm_openbsd.json
media/webrtc/gn-configs/arm_True_arm_freebsd.json
media/webrtc/gn-configs/arm_True_arm_linux.json
media/webrtc/gn-configs/arm_True_arm_netbsd.json
media/webrtc/gn-configs/arm_True_arm_openbsd.json
--- a/media/webrtc/gn-configs/arm64_False_arm64_freebsd.json
+++ b/media/webrtc/gn-configs/arm64_False_arm64_freebsd.json
@@ -105,17 +105,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14078,105 +14077,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=aarch64-linux-gnu",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14392,9 +14302,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm64_False_arm64_linux.json
+++ b/media/webrtc/gn-configs/arm64_False_arm64_linux.json
@@ -118,17 +118,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/jenkins/workspace/Firefox-default/label/aarch64/firefox/obj-aarch64-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15912,118 +15911,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-fcolor-diagnostics",
-                "--target=aarch64-linux-gnu",
-                "-pthread",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fno-omit-frame-pointer",
-                "-g0",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "NO_TCMALLOC",
-                "DISABLE_NACL",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/jenkins/workspace/Firefox-default/label/aarch64/firefox/obj-aarch64-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -16262,9 +16159,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm64_False_arm64_netbsd.json
+++ b/media/webrtc/gn-configs/arm64_False_arm64_netbsd.json
@@ -78,17 +78,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10574,78 +10573,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -10815,9 +10752,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm64_False_arm64_openbsd.json
+++ b/media/webrtc/gn-configs/arm64_False_arm64_openbsd.json
@@ -105,17 +105,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14078,105 +14077,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=aarch64-linux-gnu",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14392,9 +14302,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm64_True_arm64_freebsd.json
+++ b/media/webrtc/gn-configs/arm64_True_arm64_freebsd.json
@@ -100,17 +100,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13378,100 +13377,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=aarch64-linux-gnu",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -13677,9 +13592,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm64_True_arm64_linux.json
+++ b/media/webrtc/gn-configs/arm64_True_arm64_linux.json
@@ -114,17 +114,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/jenkins/workspace/Firefox-default/label/aarch64/firefox/obj-aarch64-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15348,114 +15347,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-fcolor-diagnostics",
-                "--target=aarch64-linux-gnu",
-                "-pthread",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "NO_TCMALLOC",
-                "DISABLE_NACL",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/jenkins/workspace/Firefox-default/label/aarch64/firefox/obj-aarch64-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -15686,9 +15587,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm64_True_arm64_netbsd.json
+++ b/media/webrtc/gn-configs/arm64_True_arm64_netbsd.json
@@ -73,17 +73,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -9874,73 +9873,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -10100,9 +10042,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm64_True_arm64_openbsd.json
+++ b/media/webrtc/gn-configs/arm64_True_arm64_openbsd.json
@@ -100,17 +100,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13378,100 +13377,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=aarch64-linux-gnu",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -13677,9 +13592,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_False_arm_freebsd.json
+++ b/media/webrtc/gn-configs/arm_False_arm_freebsd.json
@@ -111,17 +111,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15108,111 +15107,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=arm-linux-gnueabihf",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -15440,9 +15344,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_False_arm_linux.json
+++ b/media/webrtc/gn-configs/arm_False_arm_linux.json
@@ -122,17 +122,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/jenkins/workspace/Firefox-default/label/armv7/firefox/obj-armv7l-unknown-linux-gnueabihf/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -16682,122 +16681,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-fcolor-diagnostics",
-                "--target=arm-linux-gnueabihf",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-pthread",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g0",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/jenkins/workspace/Firefox-default/label/armv7/firefox/obj-armv7l-unknown-linux-gnueabihf/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -17044,9 +16937,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_False_arm_netbsd.json
+++ b/media/webrtc/gn-configs/arm_False_arm_netbsd.json
@@ -85,17 +85,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -11692,85 +11691,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wno-psabi",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -11954,9 +11884,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_False_arm_openbsd.json
+++ b/media/webrtc/gn-configs/arm_False_arm_openbsd.json
@@ -111,17 +111,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15108,111 +15107,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=arm-linux-gnueabihf",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -15440,9 +15344,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_True_arm_freebsd.json
+++ b/media/webrtc/gn-configs/arm_True_arm_freebsd.json
@@ -106,17 +106,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14398,106 +14397,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=arm-linux-gnueabihf",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14715,9 +14624,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_True_arm_linux.json
+++ b/media/webrtc/gn-configs/arm_True_arm_linux.json
@@ -119,17 +119,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/jenkins/workspace/Firefox-default/label/armv7/firefox/obj-armv7l-unknown-linux-gnueabihf/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -16253,119 +16252,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-fcolor-diagnostics",
-                "--target=arm-linux-gnueabihf",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-pthread",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-gsplit-dwarf",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/jenkins/workspace/Firefox-default/label/armv7/firefox/obj-armv7l-unknown-linux-gnueabihf/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -16606,9 +16502,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_True_arm_netbsd.json
+++ b/media/webrtc/gn-configs/arm_True_arm_netbsd.json
@@ -80,17 +80,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10982,80 +10981,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wno-psabi",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -11229,9 +11164,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/arm_True_arm_openbsd.json
+++ b/media/webrtc/gn-configs/arm_True_arm_openbsd.json
@@ -106,17 +106,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14398,106 +14397,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "--target=arm-linux-gnueabihf",
-                "-march=armv7-a",
-                "-mfloat-abi=hard",
-                "-mtune=generic-armv7-a",
-                "-mfpu=neon",
-                "-mthumb",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM",
-                "WEBRTC_ARCH_ARM_V7",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14715,9 +14624,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}