Merge branch 'master' into maintenance

lib/util.js

@@ -273,10 +273,13 @@ const util = {
         [androidResNightSource]: androidResNightDest
       }
 
-      for (const androidSourceFile of androidSourceFiles) {
-        const destinationFile = path.join(androidIconDest, path.relative(androidIconSource, androidSourceFile))
-        if (util.calculateFileChecksum(androidSourceFile) != util.calculateFileChecksum(destinationFile)) {
-          fs.copySync(androidSourceFile, destinationFile)
+      console.log('copy Android app icons and app resources')
+      Object.entries(copyAndroidResourceMapping).map(([sourcePath, destPath]) => {
+        let androidSourceFiles = []
+        if (fs.statSync(sourcePath).isDirectory()) {
+          androidSourceFiles = util.walkSync(sourcePath)
+        } else {
+          androidSourceFiles = [sourcePath]
         }
 
         for (const androidSourceFile of androidSourceFiles) {