summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-07-10 13:03:37 -0300
committerGitHub <noreply@github.com>2016-07-10 13:03:37 -0300
commite74d71a5bfccec42945836c82521469ec664b6dc (patch)
tree5d0574638bb4e066b2b0f16863ae5acd005bb8f2 /platform
parent5dd6530acf1f1db145ebfdd1c0967329b9c36fa0 (diff)
parent40d3234304535a3993b44c0a7cd55e18b14ced95 (diff)
Merge pull request #5574 from volzhs/android-app-id
Add android_add_default_config for config.py
Diffstat (limited to 'platform')
-rw-r--r--platform/android/SCsub6
-rw-r--r--platform/android/build.gradle.template1
2 files changed, 7 insertions, 0 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub
index c8feac8690..0814f4a7bc 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -79,6 +79,11 @@ for x in env.android_jni_dirs:
gradle_asset_dirs_text=""
+gradle_default_config_text=""
+
+for x in env.android_default_config:
+ gradle_default_config_text+=x+"\n\t\t"
+
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)
@@ -86,6 +91,7 @@ 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_text = gradle_text.replace("$$GRADLE_DEFAULT_CONFIG$$",gradle_default_config_text)
gradle_baseout.write( gradle_text )
diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template
index 1e1461ef29..9e617a9e9e 100644
--- a/platform/android/build.gradle.template
+++ b/platform/android/build.gradle.template
@@ -39,6 +39,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 23
+ $$GRADLE_DEFAULT_CONFIG$$
}
sourceSets {
main {