From b84f58262c1e79bde909e1f112de5bac6179e80c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= <pedrojrulez@gmail.com>
Date: Tue, 24 Jan 2017 16:29:09 +0100
Subject: Fix resources for Android modules not being merged Fixes #7421

---
 platform/android/build.gradle.template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template
index 873eef0566..c46a15bd12 100644
--- 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'
-- 
cgit v1.2.3