summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-09-27 15:50:22 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-09-28 15:35:12 +0100
commit45e12d60e3612b970a6e65f3fbd9a78c563d8986 (patch)
tree256c85f3c443f0b26e12305be5568f6538ca6906
parent83bb33a40c422973bc371126348838a701c7ccb0 (diff)
downloadreplicant_build-45e12d60e3612b970a6e65f3fbd9a78c563d8986.zip
replicant_build-45e12d60e3612b970a6e65f3fbd9a78c563d8986.tar.gz
replicant_build-45e12d60e3612b970a6e65f3fbd9a78c563d8986.tar.bz2
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
-rw-r--r--core/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile
index 37fb436..94c88d9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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) >> $@; \