diff options
| author | LuK1337 <priv.luk@gmail.com> | 2021-11-23 16:14:57 +0200 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-05-04 12:45:32 +0800 |
| commit | 22dd9cf906765c9ddd7c7eb978cc13e309345a22 (patch) | |
| tree | 8bc8cbae799b04cb26a1506aa52d7722211f7e09 | |
| parent | e5d94a00e2e60bf9cf83dd98031162c894a8acbf (diff) | |
core: Allow overriding device/model/name properties
Author: Koushik Dutta <koushd@gmail.com>
Date: Sat Jun 26 22:53:55 2010 -0700
core: Add support for overriding build.prop settings
Change-Id: Ie4224d608b7bcb0c2087bd77bc954f8f5f9b6495
Change-Id: I84c4ecb4d20fe6954551e4f07f739e04bfffd647
| -rw-r--r-- | core/product.mk | 3 | ||||
| -rw-r--r-- | core/sysprop.mk | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/core/product.mk b/core/product.mk index fa30d547c0..d846998b1d 100644 --- a/core/product.mk +++ b/core/product.mk @@ -114,6 +114,9 @@ _product_single_value_vars := # Variables that are lists of values. _product_list_vars := +# Add support to override build.prop values +_product_list_vars += PRODUCT_BUILD_PROP_OVERRIDES + _product_single_value_vars += PRODUCT_NAME _product_single_value_vars += PRODUCT_MODEL diff --git a/core/sysprop.mk b/core/sysprop.mk index 57c53504bc..a5a8f00905 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -30,6 +30,8 @@ POST_PROCESS_PROPS := $(HOST_OUT_EXECUTABLES)/post_process_props$(HOST_EXECUTABL # $(1): Partition name # $(2): Output file name define generate-common-build-props + bash -c '\ + $(or $(PRODUCT_BUILD_PROP_OVERRIDES),:);\ echo "####################################" >> $(2);\ echo "# from generate-common-build-props" >> $(2);\ echo "# These properties identify this partition image." >> $(2);\ @@ -42,10 +44,10 @@ define generate-common-build-props echo "ro.product.$(1).name=$(PRODUCT_SYSTEM_NAME)" >> $(2);\ ,\ echo "ro.product.$(1).brand=$(PRODUCT_BRAND)" >> $(2);\ - echo "ro.product.$(1).device=$(TARGET_DEVICE)" >> $(2);\ + echo "ro.product.$(1).device=$${TARGET_DEVICE:-$(TARGET_DEVICE)}" >> $(2);\ echo "ro.product.$(1).manufacturer=$(PRODUCT_MANUFACTURER)" >> $(2);\ - echo "ro.product.$(1).model=$(PRODUCT_MODEL)" >> $(2);\ - echo "ro.product.$(1).name=$(TARGET_PRODUCT)" >> $(2);\ + echo "ro.product.$(1).model=$${PRODUCT_MODEL:-$(PRODUCT_MODEL)}" >> $(2);\ + echo "ro.product.$(1).name=$${TARGET_PRODUCT:-$(TARGET_PRODUCT)}" >> $(2);\ )\ $(if $(filter system vendor odm,$(1)),\ echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST) " >> $(2);\ @@ -62,6 +64,7 @@ define generate-common-build-props echo "ro.$(1).build.version.release=$(PLATFORM_VERSION_LAST_STABLE)" >> $(2);\ echo "ro.$(1).build.version.release_or_codename=$(PLATFORM_VERSION)" >> $(2);\ echo "ro.$(1).build.version.sdk=$(PLATFORM_SDK_VERSION)" >> $(2);\ + ';\ endef @@ -264,6 +267,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \ TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \ TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ + $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) > $@ ifdef TARGET_SYSTEM_PROP |