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/installer | |
| 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/installer')
5 files changed, 0 insertions, 6 deletions
diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps index 15a7194..a0a49c9 100644 --- a/chrome/installer/linux/debian/expected_deps +++ b/chrome/installer/linux/debian/expected_deps @@ -5,7 +5,6 @@ libcairo2 (>= 1.6.0) libcap2 (>= 2.10) libcups2 (>= 1.4.0) libdbus-1-3 (>= 1.2.14) -libexif12 libexpat1 (>= 1.95.8) libfontconfig1 (>= 2.8.0) libfreetype6 (>= 2.3.9) diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386 index 920c3e3..52fd504 100644 --- a/chrome/installer/linux/rpm/expected_deps_i386 +++ b/chrome/installer/linux/rpm/expected_deps_i386 @@ -24,7 +24,6 @@ libdbus-1.so.3 libdl.so.2 libdl.so.2(GLIBC_2.0) libdl.so.2(GLIBC_2.1) -libexif.so.12 libexpat.so.1 libfontconfig.so.1 libfreetype.so.6 diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64 index 1e3f536..1435e39 100644 --- a/chrome/installer/linux/rpm/expected_deps_x86_64 +++ b/chrome/installer/linux/rpm/expected_deps_x86_64 @@ -19,7 +19,6 @@ libcups.so.2()(64bit) libdbus-1.so.3()(64bit) libdl.so.2()(64bit) libdl.so.2(GLIBC_2.2.5)(64bit) -libexif.so.12()(64bit) libexpat.so.1()(64bit) libfontconfig.so.1()(64bit) libfreetype.so.6()(64bit) diff --git a/chrome/installer/linux/sysroot_scripts/packagelist.debian.wheezy.amd64 b/chrome/installer/linux/sysroot_scripts/packagelist.debian.wheezy.amd64 index 3573518..c93eccb 100644 --- a/chrome/installer/linux/sysroot_scripts/packagelist.debian.wheezy.amd64 +++ b/chrome/installer/linux/sysroot_scripts/packagelist.debian.wheezy.amd64 @@ -61,8 +61,6 @@ main/libc/libcap2/libcap-dev_2.22-1.2_amd64.deb main/libe/libexif/libexif12_0.6.20-3_amd64.deb main/libe/libexif/libexif-dev_0.6.20-3_amd64.deb main/libf/libffi/libffi5_3.0.10-3_amd64.deb -main/libe/libexif/libexif12_0.6.20-3_amd64.deb -main/libe/libexif/libexif-dev_0.6.20-3_amd64.deb main/libg/libgcrypt11/libgcrypt11_1.5.0-5+deb7u1_amd64.deb main/libg/libgcrypt11/libgcrypt11-dev_1.5.0-5+deb7u1_amd64.deb main/libg/libgnome-keyring/libgnome-keyring0_3.4.1-1_amd64.deb diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index fcacc38..66ab4de 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -28,7 +28,6 @@ ffmpegsumo.dll: %(VersionDir)s\ icudt.dll: %(VersionDir)s\ icudtl.dat: %(VersionDir)s\ libEGL.dll: %(VersionDir)s\ -libexif.dll: %(VersionDir)s\ libGLESv2.dll: %(VersionDir)s\ nacl64.exe: %(VersionDir)s\ nacl_irt_x86_32.nexe: %(VersionDir)s\ |