Merge pull request #7625 from RandomShaper/fix-android-module-res

Fix resources for Android modules not being merged (2.1)
2017-01-25 00:04:40 +01:00 · 2017-01-25 00:04:40 +01:00 · 6549733aa7
parent c508b5b2e1 fec41c528c
commit 6549733aa7
1 changed files with 1 additions and 2 deletions
--- a/platform/android/build.gradle.template
+++ b/platform/android/build.gradle.template
@ -52,11 +52,10 @@ android {
 			java.srcDirs = ['src'
 				$$GRADLE_JAVA_DIRS$$
 			]
-			resources.srcDirs = [
+			res.srcDirs = [
 				'res'
 				$$GRADLE_RES_DIRS$$  
 			]
-			res.srcDirs = ['res']
 		//            libs.srcDirs = ['libs']
 			aidl.srcDirs = [
 				'aidl'