summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 00:08:47 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 00:08:47 +0000
commita93c77bb11abc083bf54616b40062d7a76ca3acd (patch)
tree492e68d3de6655a3c72570b9adad78db0ec76006 /third_party
parent606bceeacfe23f9b0eecccd5f9b5f018830976b9 (diff)
downloadchromium_src-a93c77bb11abc083bf54616b40062d7a76ca3acd.zip
chromium_src-a93c77bb11abc083bf54616b40062d7a76ca3acd.tar.gz
chromium_src-a93c77bb11abc083bf54616b40062d7a76ca3acd.tar.bz2
move full libvpx tree into deps to include license and gyp
BUG=55165 TEST=tools/licenses.py Review URL: http://codereview.chromium.org/4341005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libvpx/libvpx.gyp90
1 files changed, 0 insertions, 90 deletions
diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp
deleted file mode 100644
index c521364..0000000
--- a/third_party/libvpx/libvpx.gyp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'targets': [
- # libvpx_lib is not currently being used since we use libvpx inside
- # libavcodec. Keeping this just in case we need this later.
- {
- 'target_name': 'libvpx_lib',
- 'type': 'none',
- 'variables': {
- 'libvpx_lib': 'libvpx.a',
- },
- 'conditions': [
- # This section specifies the folder for looking for libvpx.a.
- #
- ['OS=="linux" and target_arch=="ia32"', {
- 'variables': {
- 'libvpx_path': 'lib/linux/ia32',
- },
- }],
- ['OS=="linux" and target_arch=="x64"', {
- 'variables': {
- 'libvpx_path': 'lib/linux/x64',
- },
- }],
- ['OS=="linux" and target_arch=="arm" and arm_neon==1', {
- 'variables': {
- 'libvpx_path': 'lib/linux/arm-neon',
- },
- }],
- ['OS=="linux" and target_arch=="arm" and arm_neon==0', {
- 'variables': {
- 'libvpx_path': 'lib/linux/arm',
- },
- }],
- ['OS=="win"', {
- 'variables': {
- 'libvpx_path': 'lib/win/ia32',
- },
- }],
- ['OS=="mac"', {
- 'variables': {
- 'libvpx_path': 'lib/mac/ia32',
- },
- }],
- ],
- 'actions': [
- {
- 'action_name': 'copy_lib',
- 'inputs': [
- '<(libvpx_path)/<(libvpx_lib)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/<(libvpx_lib)',
- ],
- 'action': [
- 'cp',
- '<(libvpx_path)/<(libvpx_lib)',
- '<(SHARED_INTERMEDIATE_DIR)/<(libvpx_lib)',
- ],
- 'message': 'Copying libvpx.a into <(SHARED_INTERMEDIATE_DIR)',
- },
- ],
- 'all_dependent_settings': {
- 'link_settings': {
- 'libraries': [
- '<(SHARED_INTERMEDIATE_DIR)/<(libvpx_lib)',
- ],
- },
- },
- },
- {
- 'target_name': 'libvpx_include',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'include_dirs': [
- 'include',
- ],
- },
- }
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: