diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
| commit | 7998197ff17892a8127aa2fe53d13937763dee87 (patch) | |
| tree | 53c97bf9907a3225776340273e773a4d904cbb73 /platform/android/SCsub | |
| parent | 62574759ab16043b70f2da6e160072c353ba4148 (diff) | |
| parent | 3c6dd5749d445f082fc925a34cc0a26f8d342304 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/android/SCsub')
| -rw-r--r-- | platform/android/SCsub | 63 |
1 files changed, 48 insertions, 15 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index 834ee58adc..3d645de38f 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -37,19 +37,59 @@ prog = None abspath=env.Dir(".").abspath -pp_basein = open(abspath+"/project.properties.template","rb") -pp_baseout = open(abspath+"/java/project.properties","wb") -pp_baseout.write( pp_basein.read() ) +gradle_basein = open(abspath+"/build.gradle.template","rb") +gradle_baseout = open(abspath+"/java/build.gradle","wb") -refcount=1 +gradle_text = gradle_basein.read() -for x in env.android_source_modules: - pp_baseout.write("android.library.reference."+str(refcount)+"="+x+"\n") - refcount+=1 +gradle_maven_repos_text="" +if len(env.android_maven_repos) > 0: + gradle_maven_repos_text+="maven {\n" + for x in env.android_maven_repos: + gradle_maven_repos_text+="\t\t"+x+"\n" + gradle_maven_repos_text+="\t}\n" -pp_baseout.close() +gradle_maven_dependencies_text="" + +for x in env.android_dependencies: + gradle_maven_dependencies_text+=x+"\n" + +gradle_java_dirs_text="" + +for x in env.android_java_dirs: + gradle_java_dirs_text+=",'"+x+"'" + + +gradle_res_dirs_text="" + +for x in env.android_res_dirs: + gradle_res_dirs_text+=",'"+x+"'" + +gradle_aidl_dirs_text="" + +for x in env.android_aidl_dirs: + gradle_aidl_dirs_text+=",'"+x+"'" + +gradle_jni_dirs_text="" + +for x in env.android_jni_dirs: + gradle_jni_dirs_text+=",'"+x+"'" + +gradle_asset_dirs_text="" + +gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$",gradle_maven_repos_text) +gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$",gradle_maven_dependencies_text) +gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$",gradle_java_dirs_text) +gradle_text = gradle_text.replace("$$GRADLE_RES_DIRS$$",gradle_res_dirs_text) +gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$",gradle_asset_dirs_text) +gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$",gradle_aidl_dirs_text) +gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$",gradle_jni_dirs_text) + + +gradle_baseout.write( gradle_text ) +gradle_baseout.close() pp_basein = open(abspath+"/AndroidManifest.xml.template","rb") @@ -61,13 +101,6 @@ manifest = manifest.replace("$$ADD_APPATTRIBUTE_CHUNKS$$",env.android_appattribu pp_baseout.write( manifest ) -for x in env.android_source_files: - shutil.copy(x,abspath+"/java/src/com/android/godot") - -for x in env.android_module_libraries: - shutil.copy(x,abspath+"/java/libs") - - env_android.SharedLibrary("#bin/libgodot",[android_objects],SHLIBSUFFIX=env["SHLIBSUFFIX"]) #env.Command('#bin/libgodot_android.so', '#platform/android/libgodot_android.so', Copy('bin/libgodot_android.so', 'platform/android/libgodot_android.so')) |