vendor/bliss: Move Bliss versioning to build/core

- props dont get populated in system/build.prop without having ADDITIONAL_BUILD_PROPERTIES.

Ref commit: https://github.com/LineageOS/android_vendor_lineage/commit/3d92f57ca0b0dab8098352c776fa03e9205e4b9a

Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Change-Id: I683679c4cd1ab49af69fc396e3ffcef248c2798a
diff --git a/build/core/main.mk b/build/core/main.mk
new file mode 100644
index 0000000..b407524
--- /dev/null
+++ b/build/core/main.mk
@@ -0,0 +1,2 @@
+# Include BlissRoms versions
+include $(TOPDIR)vendor/bliss/build/core/main_version.mk
diff --git a/build/core/main_version.mk b/build/core/main_version.mk
new file mode 100644
index 0000000..0cc63e3
--- /dev/null
+++ b/build/core/main_version.mk
@@ -0,0 +1,7 @@
+ADDITIONAL_BUILD_PROPERTIES += \
+  ro.bliss.version=$(BLISS_DISPLAY_VERSION) \
+  ro.bliss.build.status=$(BLISS_BUILDTYPE) \
+  ro.bliss.releasetype=$(BLISS_BUILDTYPE) \
+  ro.bliss.changelog.version=Changelog-$(BLISS_VERSION) \
+  ro.bliss.fingerprint=$(BLISS_FINGERPRINT) \
+  ro.bliss.static.version=$(BLISS_VERSION_STATIC)
diff --git a/config/versions.mk b/config/versions.mk
index b37b10e..8ed6cc8 100644
--- a/config/versions.mk
+++ b/config/versions.mk
@@ -39,9 +39,3 @@
 BLISS_DISPLAY_BUILDTYPE := $(BLISS_BUILDTYPE)
 BLISS_FINGERPRINT := Bliss/$(VERSION)/$(TARGET_PRODUCT_SHORT)/$(shell date +%Y%m%d)
 
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-  ro.bliss.version=$(BLISS_DISPLAY_VERSION) \
-  ro.bliss.build.status=$(BLISS_BUILDTYPE) \
-  ro.bliss.releasetype=$(BLISS_BUILDTYPE) \
-  ro.bliss.changelog.version=Changelog-$(BLISS_VERSION) \
-  ro.bliss.fingerprint=$(BLISS_FINGERPRINT)