Skip to content

Commit

Permalink
Revert 61013 - Roll DEPS to include changes to FFmpeg build system
Browse files Browse the repository at this point in the history
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

TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/3556006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61022 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
asargent@chromium.org committed Sep 30, 2010
1 parent 10abd19 commit d2fbcbd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ vars = {
"nacl_revision": "3365",
"libjingle_revision": "29",
"libvpx_revision": "60399",
"ffmpeg_revision": "60910",
"ffmpeg_revision": "60702",
}

deps = {
Expand Down
13 changes: 2 additions & 11 deletions tools/generate_stubs/generate_stubs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
# Copyright (c) 2010 The Chromium Authors. All rights reserved.
# Copyright (c) 2009 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.

Expand Down Expand Up @@ -344,16 +344,7 @@ def ExtractModuleName(infile_path):
The module name as a string.
"""
basename = os.path.basename(infile_path)

# 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
return os.path.splitext(basename)[0]


def ParseSignatures(infile):
Expand Down

0 comments on commit d2fbcbd

Please sign in to comment.