Commit a3a4a580 authored by thestig@chromium.org's avatar thestig@chromium.org

Revert 112812 - Add xinput1_3.dll redist to final package.

Adds XInput redist DLL which is a new dependency of recently added gamepad code,
and is required on Win XP. laforge has OK'd the size addition to the final
package (~100K).

BUG=79050

Review URL: http://codereview.chromium.org/8774023

TBR=scottmg@google.com
Review URL: http://codereview.chromium.org/8788009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112859 0039d316-1c4b-4281-b951-d872f2087c98
parent 93790804
...@@ -51,7 +51,6 @@ d3dx9_43.dll: %(VersionDir)s\ ...@@ -51,7 +51,6 @@ d3dx9_43.dll: %(VersionDir)s\
D3DCompiler_43.dll: %(VersionDir)s\ D3DCompiler_43.dll: %(VersionDir)s\
libEGL.dll: %(VersionDir)s\ libEGL.dll: %(VersionDir)s\
libGLESv2.dll: %(VersionDir)s\ libGLESv2.dll: %(VersionDir)s\
xinput1_3.dll: %(VersionDir)s\
default_apps\*.crx: %(VersionDir)s\default_apps\ default_apps\*.crx: %(VersionDir)s\default_apps\
default_apps\external_extensions.json: %(VersionDir)s\default_apps\ default_apps\external_extensions.json: %(VersionDir)s\default_apps\
......
...@@ -363,12 +363,6 @@ FILES = [ ...@@ -363,12 +363,6 @@ FILES = [
'arch': ['32bit', '64bit'], 'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'], 'buildtype': ['dev', 'official'],
}, },
# XInput files:
{
'filename': 'xinput1_3.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
# Native Client plugin files: # Native Client plugin files:
{ {
'filename': 'ppGoogleNaClPluginChrome.dll', 'filename': 'ppGoogleNaClPluginChrome.dll',
......
...@@ -323,29 +323,5 @@ ...@@ -323,29 +323,5 @@
], ],
}, },
}], }],
['OS=="win" and directxsdk_exists=="True"', {
'actions': [
{
'action_name': 'extract_xinput',
'variables': {
'input': 'APR2007_xinput_x86.cab',
'output': 'xinput1_3.dll',
},
'inputs': [
'../third_party/directxsdk/files/Redist/<(input)',
],
'outputs': [
'<(PRODUCT_DIR)/<(output)',
],
'action': [
'python',
'../build/extract_from_cab.py',
'..\\third_party\\directxsdk\\files\\Redist\\<(input)',
'<(output)',
'<(PRODUCT_DIR)',
],
},
]
}]
], ],
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment