aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro J. Estébanez2017-01-24 16:29:09 +0100
committerPedro J. Estébanez2017-01-24 16:29:09 +0100
commitfec41c528c71a51bf9f01c92a7e557abd82e364d (patch)
treef4a98ad8d14f318a8e9917d722206536c01e5aa7
parent0669c9816e679619753a3d8a966c73f3dd17f86c (diff)
downloadgodot-fec41c528c71a51bf9f01c92a7e557abd82e364d.tar.gz
godot-fec41c528c71a51bf9f01c92a7e557abd82e364d.tar.zst
godot-fec41c528c71a51bf9f01c92a7e557abd82e364d.zip
Fix resources for Android modules not being merged
Fixes #7421
-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 873eef056..c46a15bd1 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'