diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
| commit | a02191e04bc25c4935f804f2c080ae28663d096d (patch) | |
| tree | 3cf38961650b5734763e473336009287244306ac /chrome/installer | |
| parent | 8bad47e0f7d0c250a0443923cceb52f4a4abcd40 (diff) | |
| download | chromium_org-a02191e04bc25c4935f804f2c080ae28663d096d.tar.gz | |
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer.gypi | 8 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi index ef0ccf4948..755b4358bd 100644 --- a/chrome/installer/mini_installer.gypi +++ b/chrome/installer/mini_installer.gypi @@ -61,14 +61,6 @@ 'shlwapi.lib', 'setupapi.lib', ], - 'conditions': [ - ['MSVS_VERSION=="2005e"', { - 'AdditionalDependencies': [ # Must explicitly link in VC2005E - 'advapi32.lib', - 'shell32.lib', - ], - }], - ], }, 'VCManifestTool': { 'AdditionalManifestFiles': [ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 66ab4de70d..fcacc382a3 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -28,6 +28,7 @@ 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\ |