fix: backup the pre-v4 android app_resources in the .migration_backup during tns migrate

Author: DimitarTachev

lib/controllers/migrate-controller.ts

@@ -103,7 +103,7 @@ export class MigrateController extends UpdateControllerBase implements IMigrateC
 			this.$logger.trace(`Error during auto-generated files handling. ${(error && error.message) || error}`);
 		}
 
-		await this.migrateOldAndroidAppResources(projectData);
+		await this.migrateOldAndroidAppResources(projectData, backupDir);
 
 		try {
 			await this.cleanUpProject(projectData);
@@ -180,7 +180,7 @@ export class MigrateController extends UpdateControllerBase implements IMigrateC
 		if (!this.$androidResourcesMigrationService.hasMigrated(appResourcesPath)) {
 			this.$logger.info("Migrate old Android App_Resources structure.");
 			try {
-				await this.$androidResourcesMigrationService.migrate(appResourcesPath);
+				await this.$androidResourcesMigrationService.migrate(appResourcesPath, backupDir);
 			} catch (error) {
 				this.$logger.warn("Migrate old Android App_Resources structure failed: ", error.message);
 			}

lib/declarations.d.ts

@@ -603,7 +603,7 @@ interface IInfoService {
 interface IAndroidResourcesMigrationService {
 	canMigrate(platformString: string): boolean;
 	hasMigrated(appResourcesDir: string): boolean;
-	migrate(appResourcesDir: string): Promise<void>;
+	migrate(appResourcesDir: string, backupLocation?: string): Promise<void>;
 }
 
 /**

lib/services/android-resources-migration-service.ts

@@ -20,10 +20,10 @@ export class AndroidResourcesMigrationService implements IAndroidResourcesMigrat
 		return this.$fs.exists(path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR, constants.SRC_DIR, constants.MAIN_DIR));
 	}
 
-	public async migrate(appResourcesDir: string): Promise<void> {
+	public async migrate(appResourcesDir: string, backupLocation?: string): Promise<void> {
 		const originalAppResources = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR);
 		const appResourcesDestination = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_TEMP);
-		const appResourcesBackup = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD);
+		const appResourcesBackup = path.join(backupLocation || appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD);
 
 		try {
 			await this.tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup);