From 6ef2067c287ffbe78bf193f72fd12cf9ce57f08a Mon Sep 17 00:00:00 2001
From: "hclam@chromium.org"
<hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 30 Sep 2010 00:28:40 +0000
Subject: [PATCH] Roll DEPS to include changes to FFmpeg build system
This change will avoid exporting libvpx symbols if libvpx is not built into
FFmpeg.
BUG=None
TEST=FFmpeg can be loaded on ARM
Review URL: http://codereview.chromium.org/3518002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61013 0039d316-1c4b-4281-b951-d872f2087c98
---
DEPS | 2 +-
tools/generate_stubs/generate_stubs.py | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/DEPS b/DEPS
index fe3fdcc4ce7ed..bcbdb36caed6e 100644
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@ vars = {
"nacl_revision": "3365",
"libjingle_revision": "29",
"libvpx_revision": "60399",
- "ffmpeg_revision": "60702",
+ "ffmpeg_revision": "60910",
}
deps = {
diff --git a/tools/generate_stubs/generate_stubs.py b/tools/generate_stubs/generate_stubs.py
index 7263c1ef13738..97c8106bd66c8 100755
--- a/tools/generate_stubs/generate_stubs.py
+++ b/tools/generate_stubs/generate_stubs.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# 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.
@@ -344,7 +344,16 @@ def ExtractModuleName(infile_path):
The module name as a string.
"""
basename = os.path.basename(infile_path)
- return os.path.splitext(basename)[0]
+
+ # This loop continously removes suffixes of the filename separated by a "."
+ # character.
+ while 1:
+ new_basename = os.path.splitext(basename)[0]
+ if basename == new_basename:
+ break
+ else:
+ basename = new_basename
+ return basename
def ParseSignatures(infile):
--
GitLab