godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix resources for Android modules not being merged (master)
This commit is contained in:
Rémi Verschelde 2017-01-25 07:29:10 +01:00 committed by GitHub
parent e8d3436508 b84f58262c
commit 5726923897
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/build.gradle.template
View File

@ -52,11 +52,10 @@ android {
java.srcDirs = ['src' java.srcDirs = ['src'
$$GRADLE_JAVA_DIRS$$ $$GRADLE_JAVA_DIRS$$
] ]
resources.srcDirs = [ res.srcDirs = [
'res' 'res'
$$GRADLE_RES_DIRS$$ $$GRADLE_RES_DIRS$$
] ]
res.srcDirs = ['res']
// libs.srcDirs = ['libs'] // libs.srcDirs = ['libs']
aidl.srcDirs = [ aidl.srcDirs = [
'aidl' 'aidl'