Skip to content
Snippets Groups Projects
Commit a93c77bb authored by fbarchard@chromium.org's avatar fbarchard@chromium.org
Browse files

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
parent 606bceea
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,7 @@ vars = {
"swig_revision": "40423",
"nacl_revision": "3365",
"libjingle_revision": "33",
"libvpx_revision": "63575",
"libvpx_revision": "64931",
"ffmpeg_revision": "64326",
}
......@@ -163,17 +163,14 @@ deps = {
"src/third_party/swig/Lib":
"/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
"src/third_party/libvpx":
"/trunk/deps/third_party/libvpx@" +
Var("libvpx_revision"),
"src/third_party/ffmpeg":
"/trunk/deps/third_party/ffmpeg/source@" +
Var("ffmpeg_revision"),
"src/third_party/libvpx/include":
"/trunk/deps/third_party/libvpx/include@" +
Var("libvpx_revision"),
"src/third_party/libvpx/lib":
"/trunk/deps/third_party/libvpx/lib@" +
Var("libvpx_revision"),
"src/third_party/libjingle/source":
(Var("googlecode_url") % "libjingle") + "/trunk@" +
Var("libjingle_revision"),
......
# 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:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment