diff --git a/.eslintrc.js b/.eslintrc.js
index ffd9f2ef1ca..779537030b2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -37,11 +37,11 @@ module.exports = {
         cordovaChromeapi: true,
         appAvailability: true,
         // end cordova bindings
-        
+  
         // globals for vite
-        __APP_PRODUCTNAME__: "readonly",
-        __APP_VERSION__: "readonly",
-        __APP_REVISION__: "readonly",     
+        '__APP_PRODUCTNAME__': "readonly",
+        '__APP_VERSION__': "readonly",
+        '__APP_REVISION__': "readonly",
     },
     // ignore src/dist folders
     ignorePatterns: ["src/dist/*"],
diff --git a/gulpfile.js b/gulpfile.js
index b98591e3aa5..1dc1acb7c7e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -353,6 +353,8 @@ function processPackage(done, gitRevision, isReleaseBuild) {
 }
 
 function dist_src() {
+    const platforms = getPlatforms();
+
     const distSources = [
         './src/**/*',
         '!./src/**/*.js',
@@ -364,9 +366,22 @@ function dist_src() {
         './src/js/tabs/map.js',
     ];
 
-    return gulp.src(distSources, { base: 'src' })
-        .pipe(gulp.src('yarn.lock'))
-        .pipe(gulp.dest(DIST_DIR));
+    const distSourcesCordova = [
+        './src/**/*',
+        '!./src/css/dropdown-lists/LICENSE',
+        '!./src/support/**',
+        '!./src/**/*.less',
+    ];
+
+    if (platforms.indexOf('android') >= 0) {
+        return gulp.src(distSourcesCordova, { base: 'src' })
+            .pipe(gulp.src('yarn.lock'))
+            .pipe(gulp.dest(DIST_DIR));
+    } else {
+        return gulp.src(distSources, { base: 'src' })
+            .pipe(gulp.src('yarn.lock'))
+            .pipe(gulp.dest(DIST_DIR));
+    }
 }
 
 function dist_node_modules_css() {
@@ -1073,6 +1088,7 @@ function cordova_packagejson() {
     return gulp.src(`${CORDOVA_DIST_DIR}package.json`)
         .pipe(jeditor({
             'name': metadata.name,
+            'productName': metadata.productName,
             'description': metadata.description,
             'version': metadata.version,
             'author': metadata.author,
diff --git a/vite.config.js b/vite.config.js
index c135e007b86..f2f881c473e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -51,9 +51,9 @@ function serveLocalesPlugin() {
 
 export default defineConfig({
     define: {
-        '__APP_VERSION__': JSON.stringify(pkg.version),
-        '__APP_PRODUCTNAME__': JSON.stringify(pkg.productName),
-        '__APP_REVISION__': JSON.stringify(commitHash),
+        __APP_VERSION__: JSON.stringify(pkg.version),
+        __APP_PRODUCTNAME__: JSON.stringify(pkg.productName),
+        __APP_REVISION__: JSON.stringify(commitHash),
     },
     test: {
         // NOTE: this is a replacement location for karma tests.