mozilla-central: changeset 239344:404ab03433dbead90ba33be2c81b07263ace51b9

author	Robert Strong <robert.bugzilla@gmail.com>
	Wed, 15 Apr 2015 08:45:49 -0700
changeset 239344	404ab03433dbead90ba33be2c81b07263ace51b9
parent 239343	3cb6adf9dc710c9c4efd9701972ef4a82209e1c0
child 239345	24ccca4707eb8ff1576620c688c7e3db5691228d
child 239390	6be3314c79db2eccffe7ed1a93b0d7f3280b167f
push id	28589
push user	ryanvm@gmail.com
push date	Wed, 15 Apr 2015 19:13:10 +0000
treeherder	mozilla-central@24ccca4707eb [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	spohl
bugs	1154603
milestone	40.0a1
first release with	nightly linux32 a35163f83d22 / 40.0a1 / 20150416030209 / files nightly linux64 a35163f83d22 / 40.0a1 / 20150416030209 / files nightly mac a35163f83d22 / 40.0a1 / 20150416030209 / files nightly win32 a35163f83d22 / 40.0a1 / 20150416030209 / files nightly win64 a35163f83d22 / 40.0a1 / 20150416030209 / files
last release without	nightly linux32 a6f7a33731bc / 40.0a1 / 20150415030206 / files nightly linux64 a6f7a33731bc / 40.0a1 / 20150415030206 / files nightly mac a6f7a33731bc / 40.0a1 / 20150415030206 / files nightly win32 a6f7a33731bc / 40.0a1 / 20150415030206 / files nightly win64 a6f7a33731bc / 40.0a1 / 20150415030206 / files

--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -382,17 +382,17 @@ CopyUpdaterIntoUpdateDir(nsIFile *greDir
   if (!CopyFileIntoUpdateDir(appDir, kUpdaterApp, updateDir))
     return false;
   CopyFileIntoUpdateDir(greDir, kUpdaterINI, updateDir);
 #else
   if (!CopyFileIntoUpdateDir(greDir, kUpdaterBin, updateDir))
     return false;
   CopyFileIntoUpdateDir(appDir, kUpdaterINI, updateDir);
 #endif
-#if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(ANDROID)
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
   nsCOMPtr<nsIFile> iconDir;
   appDir->Clone(getter_AddRefs(iconDir));
   iconDir->AppendNative(NS_LITERAL_CSTRING("icons"));
   if (!CopyFileIntoUpdateDir(iconDir, kUpdaterPNG, updateDir))
     return false;
 #endif
   // Finally, return the location of the updater binary.
   nsresult rv = updateDir->Clone(getter_AddRefs(updater));