diff options
| author | Rémi Verschelde | 2017-01-25 00:04:40 +0100 |
|---|---|---|
| committer | GitHub | 2017-01-25 00:04:40 +0100 |
| commit | 6549733aa7cb31bcdb61efbc5fc3072636a327ae (patch) | |
| tree | 6da9c666bbd447a20bd92ee288d4b68ca08c9f36 /platform | |
| parent | c508b5b2e14c43a6e7a629f0d655a0e5ddcd6cd7 (diff) | |
| parent | fec41c528c71a51bf9f01c92a7e557abd82e364d (diff) | |
| download | godot-6549733aa7cb31bcdb61efbc5fc3072636a327ae.tar.gz godot-6549733aa7cb31bcdb61efbc5fc3072636a327ae.tar.zst godot-6549733aa7cb31bcdb61efbc5fc3072636a327ae.zip | |
Merge pull request #7625 from RandomShaper/fix-android-module-res
Fix resources for Android modules not being merged (2.1)
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/build.gradle.template | 3 |
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' |