Remove libwebm third_party dependency.

libwebm was used in remoting, but is not needed anymore.

Review URL: https://codereview.chromium.org/820593002

Cr-Commit-Position: refs/heads/master@{#309243}

12 files changed, 0 insertions, 113 deletions

diff --git a/BUILD.gn b/BUILD.gn
index f4aa4d7..cda1ab2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -95,7 +95,6 @@ group("root") {
     "//third_party/libpng",
     "//third_party/libsrtp",
     "//third_party/libusb",
-    "//third_party/libwebm",
     "//third_party/libwebp",
     "//third_party/libxslt",
     "//third_party/libvpx",
diff --git a/DEPS b/DEPS
index 71bca2c..ca078fe 100644
--- a/DEPS
+++ b/DEPS
@@ -296,9 +296,6 @@ deps = {
   'src/chrome/browser/resources/pdf/html_office':
     Var('chromium_git') + '/chromium/html-office-public.git' + '@' + 'eeff97614f65e0578529490d44d412032c3d7359',
 
-  'src/third_party/libwebm/source':
-   Var('chromium_git') + '/webm/libwebm.git' + '@' + '0d4cb404ea4195e5e21d04db2c955615535ce62e',
-
   'src/third_party/pdfium':
    'https://pdfium.googlesource.com/pdfium.git' + '@' +  Var('pdfium_revision'),
 
diff --git a/remoting/client/BUILD.gn b/remoting/client/BUILD.gn
index 08c502b..93ae064 100644
--- a/remoting/client/BUILD.gn
+++ b/remoting/client/BUILD.gn
@@ -21,6 +21,5 @@ static_library("client") {
     "//remoting/protocol",
     "//third_party/libyuv",
     "//third_party/webrtc/modules/desktop_capture",
-    "//third_party/libwebm",
   ]
 }
diff --git a/remoting/client/plugin/DEPS b/remoting/client/plugin/DEPS
deleted file mode 100644
index dd27068..0000000
--- a/remoting/client/plugin/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+third_party/libwebm",
-]
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
index f2414ac..92534bb 100644
--- a/remoting/remoting_client.gypi
+++ b/remoting/remoting_client.gypi
@@ -42,7 +42,6 @@
         'remoting_protocol',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-        '../third_party/libwebm/libwebm.gyp:libwebm',
       ],
       'sources': [
         '<@(remoting_client_sources)',
diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp
index b9000ba..cabdb92 100644
--- a/remoting/remoting_nacl.gyp
+++ b/remoting/remoting_nacl.gyp
@@ -106,7 +106,6 @@
         '../net/net_nacl.gyp:net_nacl',
         '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
         '../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl',
-        '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl',
         '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
         '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
         '../third_party/opus/opus_nacl.gyp:opus_nacl',
@@ -170,7 +169,6 @@
           '>(tc_lib_dir_pnacl_newlib)/libremoting_webrtc_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/liburl_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libvpx_nacl.a',
-          '>(tc_lib_dir_pnacl_newlib)/libwebm_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libyuv_nacl.a',
         ],
       },
@@ -191,7 +189,6 @@
         '../third_party/icu/icu_nacl.gyp:icui18n_nacl',
         '../third_party/icu/icu_nacl.gyp:icuuc_nacl',
         '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
-        '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl',
         '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl',
         '../third_party/modp_b64/modp_b64_nacl.gyp:modp_b64_nacl',
         '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
diff --git a/third_party/libwebm/BUILD.gn b/third_party/libwebm/BUILD.gn
deleted file mode 100644
index e3fd78b..0000000
--- a/third_party/libwebm/BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-source_set("libwebm") {
-  sources = [
-    "source/mkvmuxer.cpp",
-    "source/mkvmuxerutil.cpp",
-    "source/mkvwriter.cpp",
-  ]
-
-  # mkvmuxerutil.cpp redefines the _CRT_RAND_S macro. This is the only thing
-  # that blocks this target from using Chromium compiler settings.
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
-}
diff --git a/third_party/libwebm/OWNERS b/third_party/libwebm/OWNERS
deleted file mode 100644
index 8af0345..0000000
--- a/third_party/libwebm/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-sergeyu@chromium.org
-tomfinegan@chromium.org
diff --git a/third_party/libwebm/README.chromium b/third_party/libwebm/README.chromium
deleted file mode 100644
index bc341cd..0000000
--- a/third_party/libwebm/README.chromium
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: WebM container parser and writer.
-Short Name: libwebm
-URL: http://www.webmproject.org/code/
-Version: unknown
-License: BSD
-License File: source/LICENSE.TXT
-Security Critical: No
-
-Description:
-libwebm is a library to read and write WebM files. It's used in Chrome Remote
-Desktop to generate WebM stream that can be fed to the MedisSource API. It's
-_not_ used in Chrome to parse WebM files (there is a separate parser in
-src/media).
diff --git a/third_party/libwebm/libwebm.gyp b/third_party/libwebm/libwebm.gyp
deleted file mode 100644
index 2374d67..0000000
--- a/third_party/libwebm/libwebm.gyp
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'libwebm.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'libwebm',
-      'type': 'static_library',
-      'sources': [
-        '<@(libwebm_sources)'
-      ],
-      'defines!': [
-        # This macro is declared in common.gypi which causes warning when
-        # compiling mkvmuxerutil.cpp which also defines it.
-        '_CRT_RAND_S',
-      ],
-      'msvs_disabled_warnings': [ 4267 ],
-    },  # target libwebm
-  ]
-}
diff --git a/third_party/libwebm/libwebm.gypi b/third_party/libwebm/libwebm.gypi
deleted file mode 100644
index 0741101..0000000
--- a/third_party/libwebm/libwebm.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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.
-
-{
-  'variables': {
-    'libwebm_sources': [
-      'source/mkvmuxer.cpp',
-      'source/mkvmuxerutil.cpp',
-      'source/mkvwriter.cpp',
-    ],
-  }
-}
diff --git a/third_party/libwebm/libwebm_nacl.gyp b/third_party/libwebm/libwebm_nacl.gyp
deleted file mode 100644
index 53f722d..0000000
--- a/third_party/libwebm/libwebm_nacl.gyp
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'libwebm.gypi',
-    '../../native_client/build/untrusted.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'libwebm_nacl',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libwebm_nacl.a',
-        'build_glibc': 0,
-        'build_newlib': 0,
-        'build_pnacl_newlib': 1,
-      },
-      'dependencies': [
-        '../../native_client/tools.gyp:prep_toolchain',
-      ],
-      'sources': [
-        '<@(libwebm_sources)',
-      ],
-      'defines': [
-        # LLONG_MIN and UULONG_MAX are defined in newlib only for C++11.
-        'LLONG_MIN=LONG_LONG_MIN',
-        'ULLONG_MAX=ULONG_LONG_MAX',
-      ],
-    },  # target libwebm_nacl
-  ]
-}