diff options
-rwxr-xr-x | chrome/chrome.gyp | 10 | ||||
-rwxr-xr-x | chrome/tools/build/mac/remove_ffmpeg_dylibs | 19 |
2 files changed, 0 insertions, 29 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 2a62c46..7934790 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -5913,16 +5913,6 @@ '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries' ], }, - { - # TODO(mark): Remove after November 19, 2009, allowing two - # weeks for the transition. - 'postbuild_name': 'Remove obsolete FFmpeg dylibs', - 'variables': { - 'remove_ffmpeg_dylibs_path': - 'tools/build/mac/remove_ffmpeg_dylibs', - }, - 'action': ['<(remove_ffmpeg_dylibs_path)'], - }, ], 'copies': [ { diff --git a/chrome/tools/build/mac/remove_ffmpeg_dylibs b/chrome/tools/build/mac/remove_ffmpeg_dylibs deleted file mode 100755 index fad15ae0..0000000 --- a/chrome/tools/build/mac/remove_ffmpeg_dylibs +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# 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. - -# Remove obsolete FFmpeg shared libraries. Previously, there were three -# prebuilt FFmpeg libraries checked in as binaries, and they were copied into -# the framework's Libraries directory. Since trunk 31050, they have been -# replaced by the single library libffmpegsumo.dylib (love the name), built -# from source during a normal build. -# -# TODO(mark): Remove after November 19, 2009, allowing two weeks for the -# transition. - -LIBRARIES_DIR="${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Libraries" -rm -f "${LIBRARIES_DIR}/libavcodec.52.dylib" \ - "${LIBRARIES_DIR}/libavformat.52.dylib" \ - "${LIBRARIES_DIR}/libavutil.50.dylib" |