summaryrefslogtreecommitdiffstats
path: root/third_party/libwebm
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 08:31:32 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 08:31:32 +0000
commit14d32d59b2819f5acf00e53605f72e98b345317f (patch)
tree51d451d9c5840a2d5777222166f08402ca3b20c4 /third_party/libwebm
parentef8ebec67d3bc5bf6b0a4a7d0ed650a697fd30ea (diff)
downloadchromium_src-14d32d59b2819f5acf00e53605f72e98b345317f.zip
chromium_src-14d32d59b2819f5acf00e53605f72e98b345317f.tar.gz
chromium_src-14d32d59b2819f5acf00e53605f72e98b345317f.tar.bz2
Revert 245139 "Add libwebm in third_party."
Causing 'check_license' failure on 'Linux' builder http://build.chromium.org/p/chromium/builders/Linux/builds/46649 > Add libwebm in third_party. > > libwebm will be used by chromoting client to generate WebM stream for > MediaSource API. > > BUG=321825 > > Review URL: https://codereview.chromium.org/134643003 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/139993005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libwebm')
-rw-r--r--third_party/libwebm/OWNERS2
-rw-r--r--third_party/libwebm/README.chromium13
-rw-r--r--third_party/libwebm/libwebm.gyp18
-rw-r--r--third_party/libwebm/libwebm.gypi45
-rw-r--r--third_party/libwebm/libwebm_nacl.gyp28
5 files changed, 0 insertions, 106 deletions
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 e277407..0000000
--- a/third_party/libwebm/libwebm.gyp
+++ /dev/null
@@ -1,18 +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)'
- ]
- }, # target libwebm
- ]
-}
diff --git a/third_party/libwebm/libwebm.gypi b/third_party/libwebm/libwebm.gypi
deleted file mode 100644
index 7a82dec..0000000
--- a/third_party/libwebm/libwebm.gypi
+++ /dev/null
@@ -1,45 +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',
- ],
- }
-}
-
-if (is_android) {
- arm_use_neon = false
- # Our version of arm_neon_optional from common.gypi. This is not used in the
- # current build so is commented out for now.
- #arm_optionally_use_neon = false
-} else {
- arm_use_neon = true
- #arm_optionally_use_neon = true
-}
-
-if (arm_version == 6) {
- arm_arch = "armv6"
- arm_tune = ""
- arm_float_abi = "softfp"
- arm_fpu = "vfp"
- # Thumb is a reduced instruction set available on some ARM processors that
- # has increased code density.
- arm_use_thumb = false
-
-} else if (arm_version == 7) {
- arm_arch = "armv7-a"
- arm_tune = "cortex-a8"
- arm_float_abi = "softfp"
- arm_use_thumb = true
-
- if (arm_use_neon) {
- arm_fpu = "neon"
- } else {
- arm_fpu = "vfpv3-d16"
- }
-}
diff --git a/third_party/libwebm/libwebm_nacl.gyp b/third_party/libwebm/libwebm_nacl.gyp
deleted file mode 100644
index adec08f..0000000
--- a/third_party/libwebm/libwebm_nacl.gyp
+++ /dev/null
@@ -1,28 +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)',
- ],
- }, # target libwebm_nacl
- ]
-}