AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix -Pfirebase and -Pandroidauto Gradle options

Browse source 
Make -Pfirebase to be equivalent to -Pfirebase=true as it was before.

Fixes regression added by 8d17e90b "Add compile-time flag for Android Auto"

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-10-29 18:25:15 +02:00
parent 51200bd279
commit 227d923800
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/app/build.gradle
View file

@ -29,14 +29,15 @@ buildscript {
def googleFirebaseServicesFlag = findProperty('firebase')
// Enable Firebase for all beta flavors except fdroid only if google-services.json exists.
def googleFirebaseServicesDefault = isBeta && !isFdroid && file("$projectDir/google-services.json").exists()
ext.googleFirebaseServicesEnabled = googleFirebaseServicesFlag ? googleFirebaseServicesFlag.toBoolean() :
ext.googleFirebaseServicesEnabled = googleFirebaseServicesFlag != null ?
googleFirebaseServicesFlag == '' || googleFirebaseServicesFlag.toBoolean() :
googleFirebaseServicesDefault
// Android Auto compile-time feature flag: -Pandroidauto=true|false
def androidAutoFlag = findProperty('androidauto')
// Enable Android Auto by default for all debug and beta flavors except fdroid.
def androidAutoDefault = isSyncWithFiles || ((isDebug || isBeta) && !isFdroid)
ext.androidAutoEnabled = androidAutoFlag ? androidAutoFlag.toBoolean() : androidAutoDefault
ext.androidAutoEnabled = androidAutoFlag != null ? androidAutoFlag.toBoolean() : androidAutoDefault
dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'