summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-01-25 07:29:10 +0100
committerGitHub <noreply@github.com>2017-01-25 07:29:10 +0100
commit572692389719c67b2189ab07f8f9523cf6c82cca (patch)
tree707177a7e609e169aed0371a522bd510145d636a
parente8d34365085c2321acb0bd35aabbad293c74e744 (diff)
parentb84f58262c1e79bde909e1f112de5bac6179e80c (diff)
Merge pull request #7631 from RandomShaper/fix-android-module-res
Fix resources for Android modules not being merged (master)
-rw-r--r--platform/android/build.gradle.template3
1 files changed, 1 insertions, 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'