MSVC manifests should use processorArchitecture="*"
This is inferred from the binary itself, and specifying it here breaks the Win64 build.
BUG=166496
Review URL: https://codereview.chromium.org/12222002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180801 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/app/chrome.dll.manifest b/chrome/app/chrome.dll.manifest
index c2de753..76c63808 100644
--- a/chrome/app/chrome.dll.manifest
+++ b/chrome/app/chrome.dll.manifest
@@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<dependency>
<dependentAssembly>
- <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+ <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
</dependentAssembly>
</dependency>
</assembly>
diff --git a/chrome/app/chrome.exe.manifest b/chrome/app/chrome.exe.manifest
index be2515b..ba2f191 100644
--- a/chrome/app/chrome.exe.manifest
+++ b/chrome/app/chrome.exe.manifest
@@ -14,7 +14,7 @@
<dependency>
<dependentAssembly>
- <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+ <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
</dependentAssembly>
</dependency>
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index 4a1f149..3703a6f5 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -452,7 +452,7 @@
"<dependency>"
"<dependentAssembly>"
"<assemblyIdentity type='win32' name='chrome.{dll_name}' "
- "version='0.0.0.0' processorArchitecture='x86' language='*'/>"
+ "version='0.0.0.0' processorArchitecture='*' language='*'/>"
"</dependentAssembly>"
"</dependency>".format(dll_name=name))
@@ -476,7 +476,7 @@
"<assembly\n"
" xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>\n"
" <assemblyIdentity name='chrome.{dll_name}' version='0.0.0.0'\n"
- " type='win32' processorArchitecture='x86'/>\n"
+ " type='win32' processorArchitecture='*'/>\n"
" <file name='{dll_name}.dll'/>\n"
"</assembly>".format(dll_name=name))
