Merge branch '8_0_X' into TIMOB-26826_80X

tidev · Mar 21, 2019 · e086e09 · e086e09
2 parents 6df00dd + ce43153
commit e086e09
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -2678,17 +2678,20 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 	appc.async.series(this, tasks, function () {
 		const templateDir = path.join(this.platformPath, 'templates', 'app', 'default', 'template', 'Resources', 'android');
 
-		// if an app icon hasn't been copied, copy the default one
 		const srcIcon = path.join(templateDir, 'appicon.png');
 		const destIcon = path.join(this.buildBinAssetsResourcesDir, this.tiapp.icon);
+
+		// if an app icon hasn't been copied, copy the default one
 		if (!fs.existsSync(destIcon)) {
 			copyFile.call(this, srcIcon, destIcon);
 		}
 		delete this.lastBuildFiles[destIcon];
 
 		const destIcon2 = path.join(this.buildResDrawableDir, this.tiapp.icon);
 		if (!fs.existsSync(destIcon2)) {
-			copyFile.call(this, srcIcon, destIcon2);
+			// Note, we are explicitly copying destIcon here as we want to ensure that we're
+			// copying the user specified icon, srcIcon is the default Titanium icon
+			copyFile.call(this, destIcon, destIcon2);
 		}
 		delete this.lastBuildFiles[destIcon2];