commit 383df15b481d60fcba0058fb6e09dcfc9ee6fd42
author Max Weninger <max.weninger@gmail.com> Thu Nov 07 23:48:06 2019 +0100
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Thu Nov 07 23:48:06 2019 +0100
tree 1dece501bd75dc10e1fdca0419d197481bb12445
parent ae2b477fbc8e24ddd3e38113f2bec034726fee3b
parent b187b86d2d231932825ce10b48feb3615f4396cc

Merge "vendor: enable optional gapps build" into android-10

config/version.mk

diff --git a/config/version.mk b/config/version.mk
index c5583fa..07a68f2 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -8,8 +8,12 @@
 TARGET_PRODUCT_SHORT := $(subst omni_,,$(TARGET_PRODUCT_SHORT))
 
 # Build the final version string
-ifdef BUILDTYPE_RELEASE
-    ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
+ifeq ($(ROM_BUILDTYPE),GAPPS)
+include vendor/gapps/config.mk
+    VENDOR_EXCEPTION_PATHS += \
+    gapps
+
+    ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 else
 ifeq ($(ROM_BUILDTIME_UTC),y)
     ROM_VERSION := $(PLATFORM_VERSION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)