Merge pull request #1372 from NativeScript/vladimirov/remove-app-resources-as-plugin

rosen-vladimirov · rosen-vladimirov · commit f7971c1685d4 · 2016-01-05T11:31:48.000+02:00
Do not consider App_Resources/Android as plugin
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -284,13 +284,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	}
 
 	public processConfigurationFilesFromAppResources(): IFuture<void> {
-		return (() => {
-			// Process androidManifest.xml from App_Resources
-			let manifestFilePath = path.join(this.$projectData.appResourcesDirectoryPath, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);
-			if (this.$fs.exists(manifestFilePath).wait()) {
-				this.processResourcesFromPlugin("NativescriptAppResources", path.dirname(manifestFilePath)).wait();
-			}
-		}).future<void>()();
+		return Future.fromResult();
 	}
 
 	private processResourcesFromPlugin(pluginName: string, pluginPlatformsFolderPath: string): IFuture<void> {

Original file line number	Diff line number	Diff line change
`@@ -284,13 +284,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`public processConfigurationFilesFromAppResources(): IFuture<void> {`
`287`		`- return (() => {`
`288`		`- // Process androidManifest.xml from App_Resources`
`289`		`- let manifestFilePath = path.join(this.$projectData.appResourcesDirectoryPath, this.platformData.normalizedPlatformName, this.platformData.configurationFileName);`
`290`		`- if (this.$fs.exists(manifestFilePath).wait()) {`
`291`		`- this.processResourcesFromPlugin("NativescriptAppResources", path.dirname(manifestFilePath)).wait();`
`292`		`- }`
`293`		`- }).future<void>()();`
	`287`	`+ return Future.fromResult();`
`294`	`288`	`}`
`295`	`289`
`296`	`290`	`private processResourcesFromPlugin(pluginName: string, pluginPlatformsFolderPath: string): IFuture<void> {`