diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 22:02:00 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 22:02:00 +0000 |
| commit | e0168050a9a73fdf7b968cf5ee0091b6059ca259 (patch) | |
| tree | 741de18e6502f2d4574ef363835ccbda940d448d /chrome/chrome_dll_bundle.gypi | |
| parent | fba56f613d080b4416a9c10563beff231a339797 (diff) | |
| download | chromium_src-e0168050a9a73fdf7b968cf5ee0091b6059ca259.zip chromium_src-e0168050a9a73fdf7b968cf5ee0091b6059ca259.tar.gz chromium_src-e0168050a9a73fdf7b968cf5ee0091b6059ca259.tar.bz2 | |
Revert of Reapply "Media Galleries API Metadata: Image metadata" (https://codereview.chromium.org/216443005/)
Reason for revert:
Breaking Mac 10.6 release testers. (no idea why, but it is)
Original issue's description:
> Reapply "Media Galleries API Metadata: Image metadata"
>
> Original patch (also PS1) https://codereview.chromium.org/191583002
>
> CQ can't catch the breakages of this patch.
>
> TBR=
> BUG=318450
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261864
TBR=ccameron@chromium.org,thestig@chromium.org,grt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=318450
Review URL: https://codereview.chromium.org/225023014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll_bundle.gypi')
| -rw-r--r-- | chrome/chrome_dll_bundle.gypi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index 7dcd347..33aeb42 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -37,10 +37,6 @@ '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(WRAPPER_NAME)/$(PRODUCT_NAME)', 'INFOPLIST_FILE': 'app/framework-Info.plist', - 'LD_RUNPATH_SEARCH_PATHS': [ - # To find dylibs such as libexif. - '@loader_path/Libraries/.', - ], }, 'includes': [ 'chrome_nibs.gypi', @@ -142,10 +138,10 @@ ], 'copies': [ { + # Copy FFmpeg binaries for audio/video support. 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 'files': [ - '<(PRODUCT_DIR)/ffmpegsumo.so', # Copy FFmpeg binaries for audio/video support. - '<(PRODUCT_DIR)/libexif.dylib', + '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, { |