pa: fix PA variant for Release.

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 <herna@paranoidandroid.co>
Change-Id: Idc3e3a58575f705f7fad2d978c2a34766cf88d9e
This commit is contained in:
Hernán Castañón Álvarez 2020-03-12 11:21:36 +00:00 committed by Hernán Castañón
parent 4fb0d8192e
commit dde8b7d94a
1 changed files with 4 additions and 4 deletions

View File

@ -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