build: Move version & legal properties to PRODUCT_SYSTEM_PROPERTIES

ADDITIONAL_SYSTEM_PROPERTIES is being deprecated.
No functional changes.

Change-Id: I01fd45edcc6c700540d3b7352fc466e65677a44e

build/core/main_version.mk

@@ -3,15 +3,3 @@ ifneq ($(BUILD_FINGERPRINT),)
 ADDITIONAL_SYSTEM_PROPERTIES += \
     ro.build.fingerprint=$(BUILD_FINGERPRINT)
 endif
-
-# LineageOS System Version
-ADDITIONAL_SYSTEM_PROPERTIES += \
-    ro.lineage.version=$(LINEAGE_VERSION) \
-    ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \
-    ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
-    ro.modversion=$(LINEAGE_VERSION) \
-    ro.lineagelegal.url=https://lineageos.org/legal
-
-# LineageOS Platform Display Version
-ADDITIONAL_SYSTEM_PROPERTIES += \
-    ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION)

config/common_mobile.mk

@@ -82,6 +82,10 @@ PRODUCT_PACKAGES += \
     LineageNavigationBarNoHint \
     NavigationBarMode2ButtonOverlay
 
+# Legal
+PRODUCT_SYSTEM_PROPERTIES += \
+    ro.lineagelegal.url=https://lineageos.org/legal
+
 # Media
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     media.recorder.show_manufacturer_and_model=true

config/version.mk

@@ -36,3 +36,11 @@ LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(LINEAGE_V
 
 # Display version
 LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR)-$(LINEAGE_VERSION_SUFFIX)
+
+# LineageOS version properties
+PRODUCT_SYSTEM_PROPERTIES += \
+    ro.lineage.version=$(LINEAGE_VERSION) \
+    ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION) \
+    ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \
+    ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \
+    ro.modversion=$(LINEAGE_VERSION)