From dde8b7d94ad12b2cf1338db0d60a563c5fa7846b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Casta=C3=B1=C3=B3n=20=C3=81lvarez?= Date: Thu, 12 Mar 2020 11:21:36 +0000 Subject: [PATCH] pa: fix PA variant for Release. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As we didn't set this flag to anything on release builds and when you have a property that isn't set to anything, it will take the next property. Example: ro.pa.build.variant=ro.apex.updatable=true Signed-off-by: Hernán Castañón Álvarez Change-Id: Idc3e3a58575f705f7fad2d978c2a34766cf88d9e --- config/version.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/version.mk b/config/version.mk index d260ae20..997f63cf 100644 --- a/config/version.mk +++ b/config/version.mk @@ -51,7 +51,7 @@ else else ifeq ($(PA_BUILDTYPE), BETA) PA_BUILD_VARIANT := Beta else ifeq ($(PA_BUILDTYPE), RELEASE) - PA_BUILD_VARIANT := + PA_BUILD_VARIANT := Release endif endif @@ -62,10 +62,10 @@ else BUILD_DATE := $(shell date -u +%Y%m%d) endif -ifneq ($(filter Alpha Beta,$(PA_BUILD_VARIANT)),) - PA_VERSION := $(shell echo $(PA_VERSION_FLAVOR) | tr A-Z a-z)-$(shell echo $(PA_BUILD_VARIANT) | tr A-Z a-z)-$(PA_VERSION_CODE)-$(PA_BUILD)-$(BUILD_DATE) -else ifeq ($(PA_BUILD_VARIANT),) +ifneq ($(filter Release,$(PA_BUILD_VARIANT)),) PA_VERSION := $(shell echo $(PA_VERSION_FLAVOR) | tr A-Z a-z)-$(PA_VERSION_CODE)-$(PA_BUILD)-$(BUILD_DATE) +else ifneq ($(filter Alpha Beta,$(PA_BUILD_VARIANT)),) + PA_VERSION := $(shell echo $(PA_VERSION_FLAVOR) | tr A-Z a-z)-$(shell echo $(PA_BUILD_VARIANT) | tr A-Z a-z)-$(PA_VERSION_CODE)-$(PA_BUILD)-$(BUILD_DATE) else PA_VERSION := $(shell echo $(PA_VERSION_FLAVOR) | tr A-Z a-z)-$(PA_VERSION_CODE)-$(PA_BUILD)-$(BUILD_DATE)-$(shell echo $(PA_BUILD_VARIANT) | tr A-Z a-z) endif