diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-30 18:24:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-30 18:24:38 +0100 |
| commit | 833ef704661712fd7a5b3befe9bf280100ec9a32 (patch) | |
| tree | 121b9f49981cb90e5ea68198197492799ec06e0f /platform/android/java | |
| parent | 33b560a5cf1334d8d345eea36229230ef3d08027 (diff) | |
| parent | 50ab6decfeffb04b3f6409e573d76bed6150d52b (diff) | |
Merge pull request #34317 from m4gr3d/make_app_id_match_godot_package_name
Replace the android.defaultConfig.applicationId in build.gradle with the package/unique_name
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/app/build.gradle | 2 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 9f64c3dc8a..258ca9197a 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -51,7 +51,7 @@ android { defaultConfig { // Feel free to modify the application id to your own. - applicationId "com.godot.game" + applicationId getExportPackageName() minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk //CHUNK_ANDROID_DEFAULTCONFIG_BEGIN diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 20c3123221..862a954fac 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -10,3 +10,13 @@ ext.versions = [ ext.libraries = [ androidGradlePlugin : "com.android.tools.build:gradle:$versions.androidGradlePlugin" ] + +ext.getExportPackageName = { -> + // Retrieve the app id from the project property set by the Godot build command. + String appId = project.hasProperty("export_package_name") ? project.property("export_package_name") : "" + // Check if the app id is valid, otherwise use the default. + if (appId == null || appId.isEmpty()) { + appId = "com.godot.game" + } + return appId +} |