Process correctly androidManifest.xml from App_Resources

Author: Fatme Havaluova

lib/definitions/project.d.ts

@@ -57,6 +57,7 @@ interface IPlatformProjectService {
 	afterPrepareAllPlugins(): IFuture<void>;
 	getAppResourcesDestinationDirectoryPath(): IFuture<string>;
 	deploy(deviceIdentifier: string): IFuture<void>;
+	processConfigurationFilesFromAppResources(): IFuture<void>;
 }
 
 interface IAndroidProjectPropertiesManager {

lib/services/android-project-service.ts

@@ -276,13 +276,16 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	public preparePluginNativeCode(pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			let pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME);
-
 			this.processResourcesFromPlugin(pluginData.name, pluginPlatformsFolderPath).wait();
+		}).future<void>()();
+	}
 
+	public processConfigurationFilesFromAppResources(): IFuture<void> {
+		return (() => {
 			// Process androidManifest.xml from App_Resources
-			let manifestFilePath = path.join(this.$projectData.appResourcesDirectoryPath, this.platformData.configurationFileName);
+			let manifestFilePath = path.join(this.$projectData.appResourcesDirectoryPath, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
 			if (this.$fs.exists(manifestFilePath).wait()) {
-				this.processResourcesFromPlugin("NativescriptAppResources", this.$projectData.appResourcesDirectoryPath).wait();
+				this.processResourcesFromPlugin("NativescriptAppResources", path.dirname(manifestFilePath)).wait();
 			}
 		}).future<void>()();
 	}

lib/services/ios-project-service.ts

@@ -354,6 +354,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
+	public processConfigurationFilesFromAppResources(): IFuture<void> {
+		return Future.fromResult();
+	}
+
 	private get projectPodFilePath(): string {
 		return path.join(this.platformData.projectRoot, "Podfile");
 	}

lib/services/platform-service.ts

@@ -217,6 +217,9 @@ export class PlatformService implements IPlatformService {
 			let excludedDirs = [constants.APP_RESOURCES_FOLDER_NAME];
 			this.$projectFilesManager.processPlatformSpecificFiles(directoryPath, platform, excludedDirs).wait();
 
+			// Process configurations files from App_Resources
+			platformData.platformProjectService.processConfigurationFilesFromAppResources().wait();
+
 			this.$logger.out("Project successfully prepared");
 		}).future<void>()();
 	}