summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 20:07:56 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 20:07:56 +0000
commitde1e675607fb3f8fb34f90093f3b9500cf3f2e46 (patch)
tree2849dd58762a610caa55558b901b03533d482f6d
parent3fd7c8635218cffbf3780810b935cd06d9b1ff1a (diff)
downloadchromium_src-de1e675607fb3f8fb34f90093f3b9500cf3f2e46.zip
chromium_src-de1e675607fb3f8fb34f90093f3b9500cf3f2e46.tar.gz
chromium_src-de1e675607fb3f8fb34f90093f3b9500cf3f2e46.tar.bz2
Revert 54363 since it adds a runtime dependency on MSVCR80.dll.
TBR=mal Review URL: http://codereview.chromium.org/3057026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54367 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/mini_installer/chrome.release3
-rw-r--r--chrome/tools/build/win/FILES5
-rw-r--r--chrome/tools/build/win/FILES.cfg16
3 files changed, 1 insertions, 23 deletions
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 48100b8..a58fc28 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -48,9 +48,6 @@ servers\*.exe: %(VersionDir)s\
Extensions\*.*: %(VersionDir)s\Extensions\
av*.dll: %(VersionDir)s\
pdf.dll: %(VersionDir)s\
-d3dx9_42.dll: %(VersionDir)s\
-libEGL.dll: %(VersionDir)s\
-libGLESv2.dll: %(VersionDir)s\
[GOOGLE_CHROME]
gcswf32.dll: %(VersionDir)s\
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES
index 62811d5..071530f 100644
--- a/chrome/tools/build/win/FILES
+++ b/chrome/tools/build/win/FILES
@@ -63,7 +63,4 @@ resources.pak
wow_helper.exe
gcswf32.dll
plugin.vch
-pdf.dll
-d3dx9_42.dll
-libEGL.dll
-libGLESv2.dll
+pdf.dll \ No newline at end of file
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index a5f7da5..c258ca2 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -347,20 +347,4 @@ FILES = [
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
- # ANGLE files:
- {
- 'filename': 'd3dx9_42.dll',
- 'arch': ['32bit', '64bit'],
- 'buildtype': ['dev', 'official'],
- },
- {
- 'filename': 'libEGL.dll',
- 'arch': ['32bit', '64bit'],
- 'buildtype': ['dev', 'official'],
- },
- {
- 'filename': 'libGLESv2.dll',
- 'arch': ['32bit', '64bit'],
- 'buildtype': ['dev', 'official'],
- },
]