From 6540e8dcc9a277826375932d42ff67da3354a047 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 28 Aug 2020 16:00:00 +0000 Subject: [PATCH] Handle Android Q in community script for Android version detection --- build-community.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build-community.sh b/build-community.sh index e5feb4d..c2797e4 100755 --- a/build-community.sh +++ b/build-community.sh @@ -144,14 +144,17 @@ for branch in ${BRANCH_NAME//,/ }; do sync_successful=false fi - android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.OPM1 := //p' build/core/version_defaults.mk) + android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.QP1A := //p' build/core/version_defaults.mk) if [ -z $android_version ]; then - android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.PPR1 := //p' build/core/version_defaults.mk) + android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.OPM1 := //p' build/core/version_defaults.mk) if [ -z $android_version ]; then - android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION := //p' build/core/version_defaults.mk) + android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.PPR1 := //p' build/core/version_defaults.mk) if [ -z $android_version ]; then - echo ">> [$(date)] Can't detect the android version" - exit 1 + android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION := //p' build/core/version_defaults.mk) + if [ -z $android_version ]; then + echo ">> [$(date)] Can't detect the android version" + exit 1 + fi fi fi fi -- GitLab