Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45e12d60 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

build: Prevent some auto-generated variables from being overridden 

These variables are used by internal processes for build indexing
and identification, and those processes expect either specific patterns,
or uniqueness.
So prevent accidental overriding of these by device configurations:
BUILD_DISPLAY_ID, BUILD_NUMBER, PLATFORM_VERSION, PLATFORM_SDK_VERSION,
PLATFORM_VERSION_CODENAME, BUILD_VERSION_TAGS

Change-Id: I06252f2687a5e5fd97ee21a98f26c739fd0ef6e4
parent 83bb33a4

core/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -189,12 +189,6 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			PRODUCT_MANUFACTURER="$(PRODUCT_MANUFACTURER)" \

			PRIVATE_BUILD_DESC="$(PRIVATE_BUILD_DESC)" \

			BUILD_ID="$(BUILD_ID)" \

			BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \

			BUILD_NUMBER="$(BUILD_NUMBER)" \

			PLATFORM_VERSION="$(PLATFORM_VERSION)" \

			PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \

			PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \

			BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \
@@ -202,6 +196,12 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( 
			TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

			$(PRODUCT_BUILD_PROP_OVERRIDES) \

			BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \

			BUILD_NUMBER="$(BUILD_NUMBER)" \

			PLATFORM_VERSION="$(PLATFORM_VERSION)" \

			PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \

			PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \

			BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

	        bash $(BUILDINFO_SH) > $@

	$(hide) if [ -f "$(system_prop_file)" ]; then \

	          cat $(system_prop_file) >> $@; \