tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/sysprop.mk

514 lines
19 KiB
Makefile
Raw Normal View History

Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
#
# Copyright (C) 2020 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
Move build.prop to ./etc subdir for some partitions build.prop files under system_ext, product, and odm partitions are moved to the ./etc subdirectory. This is to be in-line with the established practice of having all configuration files under ./etc subdir. build.prop doesn't need to be an exception. However, system/build.prop and vendor/build.prop were not moved because there are a lot of apps and tools that depend on the path. Bug: 158735147 Test: device has build.prop under ./etc and is bootable Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-06-29 03:46:22 +02:00
# sysprop.mk defines rules for generating <partition>/[etc/]build.prop files
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
# -----------------------------------------------------------------
# property_overrides_split_enabled
property_overrides_split_enabled :=
ifeq ($(BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED), true)
property_overrides_split_enabled := true
endif
BUILDINFO_SH := build/make/tools/buildinfo.sh
Refactor post_process_props.py The script is refactored to not parse lines everytime a prop is looked up or updated. Also it is now built using python_binary_host. Bug: 117892318 Test: m Change-Id: I1677ca5aa919c54b7b0740fdc52e1399009f9a12
2020-05-20 11:33:43 +02:00
POST_PROCESS_PROPS := $(HOST_OUT_EXECUTABLES)/post_process_props$(HOST_EXECUTABLE_SUFFIX)
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
remove buildinfo_common.sh The shell script was responsible for appending some system properties that are common to <partition>/build.prop files. The values of the system properties were given via environment variables whose names were slightly different from their corresponding make var names. This change removes the script and instead write the system properties directly in Make, thus eliminating the need to keep track of the mapping across sysprop names, environment variable names, and make var names. Bug: 117892318 Test: m Change-Id: I4d88733c1afa30ea0c0c4fcfc2b349f07f7fc090
2020-05-25 19:01:05 +02:00
# Emits a set of sysprops common to all partitions to a file.
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
# $(1): Partition name
# $(2): Output file name
define generate-common-build-props
remove buildinfo_common.sh The shell script was responsible for appending some system properties that are common to <partition>/build.prop files. The values of the system properties were given via environment variables whose names were slightly different from their corresponding make var names. This change removes the script and instead write the system properties directly in Make, thus eliminating the need to keep track of the mapping across sysprop names, environment variable names, and make var names. Bug: 117892318 Test: m Change-Id: I4d88733c1afa30ea0c0c4fcfc2b349f07f7fc090
2020-05-25 19:01:05 +02:00
echo "####################################" >> $(2);\
echo "# from generate-common-build-props" >> $(2);\
echo "# These properties identify this partition image." >> $(2);\
echo "####################################" >> $(2);\
$(if $(filter system,$(1)),\
echo "ro.product.$(1).brand=$(PRODUCT_SYSTEM_BRAND)" >> $(2);\
echo "ro.product.$(1).device=$(PRODUCT_SYSTEM_DEVICE)" >> $(2);\
echo "ro.product.$(1).manufacturer=$(PRODUCT_SYSTEM_MANUFACTURER)" >> $(2);\
echo "ro.product.$(1).model=$(PRODUCT_SYSTEM_MODEL)" >> $(2);\
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).manufacturer=$(PRODUCT_MANUFACTURER)" >> $(2);\
echo "ro.product.$(1).model=$(PRODUCT_MODEL)" >> $(2);\
echo "ro.product.$(1).name=$(TARGET_PRODUCT)" >> $(2);\
)\
Make ro.product.cpu.abilist.* to be fetched dynamically The patch rename the original ro.product.cpu.abilist* to ro.system.product.cpu.abilist*. The property service will define ro.product.cpu.abilist* by the intersect ABIs of ro.{partition}.product.cpu.abilist*. Bug: 176520383 Test: build aosp_arm64-userdebug and check the system/build.prop Change-Id: I26e404632b28e9f6abd462920e0084ad2022a763
2020-12-31 09:59:27 +01:00
$(if $(filter system vendor odm,$(1)),\
echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST) " >> $(2);\
echo "ro.$(1).product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT)" >> $(2);\
echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\
)\
remove buildinfo_common.sh The shell script was responsible for appending some system properties that are common to <partition>/build.prop files. The values of the system properties were given via environment variables whose names were slightly different from their corresponding make var names. This change removes the script and instead write the system properties directly in Make, thus eliminating the need to keep track of the mapping across sysprop names, environment variable names, and make var names. Bug: 117892318 Test: m Change-Id: I4d88733c1afa30ea0c0c4fcfc2b349f07f7fc090
2020-05-25 19:01:05 +02:00
echo "ro.$(1).build.date=`$(DATE_FROM_FILE)`" >> $(2);\
echo "ro.$(1).build.date.utc=`$(DATE_FROM_FILE) +%s`" >> $(2);\
echo "ro.$(1).build.fingerprint=$(BUILD_FINGERPRINT_FROM_FILE)" >> $(2);\
echo "ro.$(1).build.id=$(BUILD_ID)" >> $(2);\
echo "ro.$(1).build.tags=$(BUILD_VERSION_TAGS)" >> $(2);\
echo "ro.$(1).build.type=$(TARGET_BUILD_VARIANT)" >> $(2);\
echo "ro.$(1).build.version.incremental=$(BUILD_NUMBER_FROM_FILE)" >> $(2);\
Make the ro.build.version.release consistent between device build prop & partition build prop The ro.build.version.release has updated to use the last stable platform version in go/ab/10260813. But the logic for per-partition build prop has never been updated. This mismatch eventually reflects in the device's build fingerprints and cause confusion. This cl updates the partition build props to match the behavior of the top level build props. Also the device's fingerprints is heavily used in static analysis, e.g. ota targeting, the change to its computation may cause unexpected effects. Bug: 170968068 Bug: 158483506 Test: build system image for coral, check the build prop Change-Id: Icf741c915f2eba970258979efc274e424187ac69
2020-10-16 02:22:48 +02:00
echo "ro.$(1).build.version.release=$(PLATFORM_VERSION_LAST_STABLE)" >> $(2);\
echo "ro.$(1).build.version.release_or_codename=$(PLATFORM_VERSION)" >> $(2);\
remove buildinfo_common.sh The shell script was responsible for appending some system properties that are common to <partition>/build.prop files. The values of the system properties were given via environment variables whose names were slightly different from their corresponding make var names. This change removes the script and instead write the system properties directly in Make, thus eliminating the need to keep track of the mapping across sysprop names, environment variable names, and make var names. Bug: 117892318 Test: m Change-Id: I4d88733c1afa30ea0c0c4fcfc2b349f07f7fc090
2020-05-25 19:01:05 +02:00
echo "ro.$(1).build.version.sdk=$(PLATFORM_SDK_VERSION)" >> $(2);\
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
endef
Move build.prop to ./etc subdir for some partitions build.prop files under system_ext, product, and odm partitions are moved to the ./etc subdirectory. This is to be in-line with the established practice of having all configuration files under ./etc subdir. build.prop doesn't need to be an exception. However, system/build.prop and vendor/build.prop were not moved because there are a lot of apps and tools that depend on the path. Bug: 158735147 Test: device has build.prop under ./etc and is bootable Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-06-29 03:46:22 +02:00
# Rule for generating <partition>/[etc/]build.prop file
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
#
# $(1): partition name
# $(2): path to the output
# $(3): path to the input *.prop files. The contents of the files are directly
# emitted to the output
# $(4): list of variable names each of which contains name=value pairs
# $(5): optional list of prop names to force remove from the output. Properties from both
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
# $(3) and (4) are affected
# $(6): optional list of files to append at the end. The content of each file is emitted
# to the output
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
# $(7): optional flag to skip common properties generation
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
define build-properties
ALL_DEFAULT_INSTALLED_MODULES += $(2)
Support optional prop assignments This CL adds a number of changes to make the assignment of system properties to be less confusing. 1. Added `a ?= b` syntax, which is called optional prop assignments. The prop `a` gets the value `b` only when there is no non-optional prop assignment for `a` such as `a = c`. This is useful for props that provide some reasonable default values as fallback. 2. With the introduction of the optional prop assignment syntax, duplicated non-optional assignments is prohibited; e.g., the follwing now triggers a build-time error: a = b a = c , but the following doesn't: a ?= b a = c Note that the textual order between the optional and non-optional assignments doesn't matter. The non-optional assignment eclipses the optional assignment even when the former appears 'before' the latter. a = c a ?= b In the above, `a` gets the value `c` When there are multiple optional assignments without a non-optional assignments as shown below, the last one wins: a ?= b a ?= c `a` becomes `c`. Specifically, the former assignment is commented out and the latter is converted to a non-optional assignment. 3. post_process_props.py is modified so that when a prop assignment is deleted, changed, or added, the changes are recorded as comments. This is to aid debugging. Previously, it was often difficult to find out why a certain sysprop assignment is missing or is added. 4. post_process_prop.py now has a unittest Bug: 117892318 Bug: 158735147 Test: atest --host post_process_prop_unittest Exempt-From-Owner-Approval: cherry-pick from master Merged-In: I9c073a21c8257987cf2378012cadaeeeb698a4fb (cherry picked from commit 7aeb8de74e08eb2d305686aa8eff45353973e7d7) Change-Id: I9c073a21c8257987cf2378012cadaeeeb698a4fb
2020-06-22 10:30:57 +02:00
$(eval # Properties can be assigned using `prop ?= value` or `prop = value` syntax.)
$(eval # Eliminate spaces around the ?= and = separators.)
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(foreach name,$(strip $(4)),\
Support optional prop assignments This CL adds a number of changes to make the assignment of system properties to be less confusing. 1. Added `a ?= b` syntax, which is called optional prop assignments. The prop `a` gets the value `b` only when there is no non-optional prop assignment for `a` such as `a = c`. This is useful for props that provide some reasonable default values as fallback. 2. With the introduction of the optional prop assignment syntax, duplicated non-optional assignments is prohibited; e.g., the follwing now triggers a build-time error: a = b a = c , but the following doesn't: a ?= b a = c Note that the textual order between the optional and non-optional assignments doesn't matter. The non-optional assignment eclipses the optional assignment even when the former appears 'before' the latter. a = c a ?= b In the above, `a` gets the value `c` When there are multiple optional assignments without a non-optional assignments as shown below, the last one wins: a ?= b a ?= c `a` becomes `c`. Specifically, the former assignment is commented out and the latter is converted to a non-optional assignment. 3. post_process_props.py is modified so that when a prop assignment is deleted, changed, or added, the changes are recorded as comments. This is to aid debugging. Previously, it was often difficult to find out why a certain sysprop assignment is missing or is added. 4. post_process_prop.py now has a unittest Bug: 117892318 Bug: 158735147 Test: atest --host post_process_prop_unittest Exempt-From-Owner-Approval: cherry-pick from master Merged-In: I9c073a21c8257987cf2378012cadaeeeb698a4fb (cherry picked from commit 7aeb8de74e08eb2d305686aa8eff45353973e7d7) Change-Id: I9c073a21c8257987cf2378012cadaeeeb698a4fb
2020-06-22 10:30:57 +02:00
$(eval _temp := $$(call collapse-pairs,$$($(name)),?=))\
$(eval _resolved_$(name) := $$(call collapse-pairs,$$(_temp),=))\
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
)
BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction As the final step for the refactoring of sysprop configuration, this change adds BUILD_BROKEN_DUP_SYSPROP which is the escape hatch for the new restriction. When it is turned on, the new syntax `a ?= b` collapses to the old syntax `a = b`, duplicated assignments are allowed, and the dups are resolved following the legacy rule of preferring the first. This change also summarizes all the user-facing changes to the Change.md file. Lastly, post_process_prop.py is refactored to accept new argument '--allow-dup' which when turned on allowes duplicated sysprops. Bug: 117892318 Bug: 158735147 Test: atest --host post_process_prop_unittest Exempt-From-Owner-Approval: cherry-pick from master Merged-In: I7bdfffd47d50aad66a78e28a30c3dad7ebac080c (cherry picked from commit b302cdf6a417b9c8eaedee713187735a74707d6a) Change-Id: I7bdfffd47d50aad66a78e28a30c3dad7ebac080c
2020-06-26 10:38:00 +02:00
$(eval # Implement the legacy behavior when BUILD_BROKEN_DUP_SYSPROP is on.)
$(eval # Optional assignments are all converted to normal assignments and)
$(eval # when their duplicates the first one wins)
$(if $(filter true,$(BUILD_BROKEN_DUP_SYSPROP)),\
$(foreach name,$(strip $(4)),\
$(eval _temp := $$(subst ?=,=,$$(_resolved_$(name))))\
$(eval _resolved_$(name) := $$(call uniq-pairs-by-first-component,$$(_resolved_$(name)),=))\
)\
$(eval _option := --allow-dup)\
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
)
Remove redundant dependency to API_FINGERPRINT API_FINGERPRINT is only used from buildinfo.prop. Bug: 188068953 Test: build Change-Id: I4804d3e61d0bac83c59c54751209bf47404e3a31
2021-06-09 10:36:08 +02:00
$(2): $(POST_PROCESS_PROPS) $(INTERNAL_BUILD_ID_MAKEFILE) $(3) $(6)
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(hide) echo Building $$@
$(hide) mkdir -p $$(dir $$@)
$(hide) rm -f $$@ && touch $$@
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
ifneq ($(strip $(7)), true)
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(hide) $$(call generate-common-build-props,$(call to-lower,$(strip $(1))),$$@)
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
endif
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(hide) $(foreach file,$(strip $(3)),\
if [ -f "$(file)" ]; then\
echo "" >> $$@;\
echo "####################################" >> $$@;\
echo "# from $(file)" >> $$@;\
echo "####################################" >> $$@;\
cat $(file) >> $$@;\
fi;)
$(hide) $(foreach name,$(strip $(4)),\
echo "" >> $$@;\
echo "####################################" >> $$@;\
echo "# from variable $(name)" >> $$@;\
echo "####################################" >> $$@;\
$$(foreach line,$$(_resolved_$(name)),\
echo "$$(line)" >> $$@;\
)\
)
Use BOARD_API_LEVEL to define ro.board.api_level GRF devices must define the API level of which the SoC is first shipped by setting BOARD_SHIPPING_API_LEVEL. As this is a permanent value, vendors may not change this value even if they implement new features under the GRF policy. BOARD_API_LEVEL can be optionally defined in this case to manually set the api level of the vendor implementation. The current api level will be set to `ro.board.api_level` property. Bug: 176950752 Test: atest --host post_process_props_unittest Change-Id: Ib126c1a622ded9848650f3f60c0f15005867272d
2021-04-02 09:29:06 +02:00
$(hide) $(POST_PROCESS_PROPS) $$(_option) --sdk-version $(PLATFORM_SDK_VERSION) $$@ $(5)
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(hide) $(foreach file,$(strip $(6)),\
if [ -f "$(file)" ]; then\
cat $(file) >> $$@;\
fi;)
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(hide) echo "# end of file" >> $$@
endef
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
# -----------------------------------------------------------------
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
# Define fingerprint, thumbprint, and version tags for the current build
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
#
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
# BUILD_VERSION_TAGS is a comma-separated list of tags chosen by the device
# implementer that further distinguishes the build. It's basically defined
# by the device implementer. Here, we are adding a mandatory tag that
# identifies the signing config of the build.
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
BUILD_VERSION_TAGS := $(BUILD_VERSION_TAGS)
ifeq ($(TARGET_BUILD_TYPE),debug)
BUILD_VERSION_TAGS += debug
endif
# The "test-keys" tag marks builds signed with the old test keys,
# which are available in the SDK. "dev-keys" marks builds signed with
# non-default dev keys (usually private keys from a vendor directory).
# Both of these tags will be removed and replaced with "release-keys"
# when the target-files is signed in a post-build step.
ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
BUILD_KEYS := test-keys
else
BUILD_KEYS := dev-keys
endif
BUILD_VERSION_TAGS += $(BUILD_KEYS)
BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
# BUILD_FINGERPRINT is used used to uniquely identify the combined build and
# product; used by the OTA server.
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
ifeq (,$(strip $(BUILD_FINGERPRINT)))
ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
BF_BUILD_NUMBER := $(BUILD_USERNAME)$$($(DATE_FROM_FILE) +%m%d%H%M)
else
BF_BUILD_NUMBER := $(file <$(BUILD_NUMBER_FILE))
endif
BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
endif
# unset it for safety.
BF_BUILD_NUMBER :=
BUILD_FINGERPRINT_FILE := $(PRODUCT_OUT)/build_fingerprint.txt
ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) >$(BUILD_FINGERPRINT_FILE) && grep " " $(BUILD_FINGERPRINT_FILE)))
$(error BUILD_FINGERPRINT cannot contain spaces: "$(file <$(BUILD_FINGERPRINT_FILE))")
endif
BUILD_FINGERPRINT_FROM_FILE := $$(cat $(BUILD_FINGERPRINT_FILE))
# unset it for safety.
BUILD_FINGERPRINT :=
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
# BUILD_THUMBPRINT is used to uniquely identify the system build; used by the
# OTA server. This purposefully excludes any product-specific variables.
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
ifeq (,$(strip $(BUILD_THUMBPRINT)))
BUILD_THUMBPRINT := $(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER_FROM_FILE):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)
endif
BUILD_THUMBPRINT_FILE := $(PRODUCT_OUT)/build_thumbprint.txt
ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_THUMBPRINT) >$(BUILD_THUMBPRINT_FILE) && grep " " $(BUILD_THUMBPRINT_FILE)))
$(error BUILD_THUMBPRINT cannot contain spaces: "$(file <$(BUILD_THUMBPRINT_FILE))")
endif
BUILD_THUMBPRINT_FROM_FILE := $$(cat $(BUILD_THUMBPRINT_FILE))
# unset it for safety.
BUILD_THUMBPRINT :=
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
# -----------------------------------------------------------------
# Define human readable strings that describe this build
#
# BUILD_ID: detail info; has the same info as the build fingerprint
BUILD_DESC := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) $(PLATFORM_VERSION) $(BUILD_ID) $(BUILD_NUMBER_FROM_FILE) $(BUILD_VERSION_TAGS)
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
# BUILD_DISPLAY_ID is shown under Settings -> About Phone
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
ifeq ($(TARGET_BUILD_VARIANT),user)
# User builds should show:
# release build number or branch.buld_number non-release builds
# Dev. branches should have DISPLAY_BUILD_NUMBER set
ifeq (true,$(DISPLAY_BUILD_NUMBER))
BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS)
else
BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS)
endif
else
# Non-user builds should show detailed build information
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
BUILD_DISPLAY_ID := $(BUILD_DESC)
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
endif
# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test
# harness to distinguish builds. Only add _asan for a sanitized build
# if it isn't already a part of the flavor (via a dedicated lunch
# config for example).
TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)
ifneq (, $(filter address, $(SANITIZE_TARGET)))
ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR)))
TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan
endif
endif
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
KNOWN_OEM_THUMBPRINT_PROPERTIES := \
ro.product.brand \
ro.product.name \
ro.product.device
OEM_THUMBPRINT_PROPERTIES := $(filter $(KNOWN_OEM_THUMBPRINT_PROPERTIES),\
$(PRODUCT_OEM_PROPERTIES))
KNOWN_OEM_THUMBPRINT_PROPERTIES:=
# -----------------------------------------------------------------
# system/build.prop
#
# Note: parts of this file that can't be generated by the build-properties
# macro are manually created as separate files and then fed into the macro
# Accepts a whitespace separated list of product locales such as
# (en_US en_AU en_GB...) and returns the first locale in the list with
# underscores replaced with hyphens. In the example above, this will
# return "en-US".
define get-default-product-locale
$(strip $(subst _,-, $(firstword $(1))))
endef
Rebuild buildinfo.prop after installclean aosp/1317598 has made a regression that the dependency from buildinfo.prop to INSTALLED_ANDROID_INFO_TXT_TARGET is removed. As a result, buildinfo.prop is not re-builty even after installclean, which caused inconsistency between ro.build.display.id (from buildinfo.prop) and ro.system.build.fingerprint (from build.prop which is re-built). Fixing the issue by moving buildinfo.prop from $(call intermediates-dir-for,ETC) to $(call intermediates-dir-for,PACKAGING) so that it gets deleted by installclean. Bug: 158583916 Test: m out/target/product/generic_arm64/system/build.prop m installclean m out/target/product/generic_arm64/system/build.prop Inspect out/soong/verbose.gz and check that buildinfo.prop was newly created. Change-Id: Id82b8fdc872deffb6a1764ca6d3c7114301dee1d
2020-07-14 08:15:50 +02:00
gen_from_buildinfo_sh := $(call intermediates-dir-for,PACKAGING,system_build_prop)/buildinfo.prop
Add missing buildinfo dependencies. Test: Manually via USE_BAZEL=1 m dist (fixes a failure). Change-Id: Ideb8dfd2e13932be5dcdef780888ffd602b15bd2
2020-12-08 10:46:55 +01:00
$(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(BUILD_DATETIME_FILE) $(BUILD_NUMBER_FILE)
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
$(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \
TARGET_BUILD_FLAVOR="$(TARGET_BUILD_FLAVOR)" \
TARGET_DEVICE="$(TARGET_DEVICE)" \
PRODUCT_DEFAULT_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \
PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
PRIVATE_BUILD_DESC="$(BUILD_DESC)" \
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
BUILD_ID="$(BUILD_ID)" \
BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \
DATE="$(DATE_FROM_FILE)" \
BUILD_USERNAME="$(BUILD_USERNAME)" \
BUILD_HOSTNAME="$(BUILD_HOSTNAME)" \
BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \
BOARD_BUILD_SYSTEM_ROOT_IMAGE="$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)" \
Don't set the build id if we need to append the digest Background in http://go/compatible-build-fingerprint. If we want to append unique vbmeta digest to build id, we cannot setup the prop value at build time. Instead, set the old value as ro.build.legacy.id; and let init set ro.build.id at runtime. Bug: 186786987 Test: build a target file with the flag on Change-Id: Ie139725bb7e5c65bd3f28f43b9975ba48ee10354
2021-05-05 21:07:33 +02:00
BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT="$(BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT)" \
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
PLATFORM_VERSION="$(PLATFORM_VERSION)" \
Add PLATFORM_DISPLAY_VERSION Add PLATFORM_DISPLAY_VERSION to version_defaults.mk that will propagate to the ro.build.version.release_or_preview_display property and be shown as the Android version for preview releases by Settings. Bug: 221950960 Test: manual Change-Id: I697cc59f77f92aa98a8a2573662797e6d3bd2042
2022-03-01 03:01:35 +01:00
PLATFORM_DISPLAY_VERSION="$(PLATFORM_DISPLAY_VERSION)" \
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
PLATFORM_VERSION_LAST_STABLE="$(PLATFORM_VERSION_LAST_STABLE)" \
PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \
PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \
PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \
PLATFORM_PREVIEW_SDK_VERSION="$(PLATFORM_PREVIEW_SDK_VERSION)" \
PLATFORM_PREVIEW_SDK_FINGERPRINT="$$(cat $(API_FINGERPRINT))" \
PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \
PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \
Introduce ro.build.version.known_codenames sysprop. It defines values for Build.VERSION.KNOWN_CODENAMES constant, and should contain all codenames starting from Q, including current codename for in development branches. Bug: 211747008 Test: presubmit Change-Id: If8995750e369ba39bfc7041580c21b2f96632a78
2022-02-09 22:59:28 +01:00
PLATFORM_VERSION_KNOWN_CODENAMES="$(PLATFORM_VERSION_KNOWN_CODENAMES)" \
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION="$(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION)" \
BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \
$(if $(OEM_THUMBPRINT_PROPERTIES),BUILD_THUMBPRINT="$(BUILD_THUMBPRINT_FROM_FILE)") \
TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \
TARGET_CPU_ABI_LIST_32_BIT="$(TARGET_CPU_ABI_LIST_32_BIT)" \
TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \
TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \
TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
bash $(BUILDINFO_SH) > $@
ifdef TARGET_SYSTEM_PROP
system_prop_file := $(TARGET_SYSTEM_PROP)
else
system_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/system.prop)
endif
_prop_files_ := \
$(gen_from_buildinfo_sh) \
$(system_prop_file)
# Order matters here. When there are duplicates, the last one wins.
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter
_prop_vars_ := \
ADDITIONAL_SYSTEM_PROPERTIES \
Organize product vars for adding properties Properties for <partition>/build.prop are now added via PRODUCT_<PARTITION>_PROPERTIES. PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES will be deprecated. PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new variable. For other partitions (odm, system_ext, product), there is no change. Exempt-From-Owner-Approval: cherry-pick from internal master Bug: 117892318 Test: m Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44 (cherry picked from commit ad810b6dae32a42a828dfbddcaeec89f295d695e) Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-05-29 10:50:03 +02:00
PRODUCT_SYSTEM_PROPERTIES
# TODO(b/117892318): deprecate this
_prop_vars_ += \
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
PRODUCT_SYSTEM_DEFAULT_PROPERTIES
ifndef property_overrides_split_enabled
_prop_vars_ += \
Include vendor overrides in system prop if not split Bug: 163854285 Test: m on crosshatch. Vendor overrides are included in system/build.prop on legacy devices. Change-Id: Ib134f934de8546af3dff27312f6877eafe5ed22c
2020-08-14 00:21:32 +02:00
ADDITIONAL_VENDOR_PROPERTIES \
PRODUCT_VENDOR_PROPERTIES
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
endif
INSTALLED_BUILD_PROP_TARGET := $(TARGET_OUT)/build.prop
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(eval $(call build-properties,\
system,\
$(INSTALLED_BUILD_PROP_TARGET),\
$(_prop_files_),\
$(_prop_vars_),\
Change how we set ro.product.first_api_level. The goal of this change is to cause ro.product.first_api_level to be set in /system/build.prop in targets with PRODUCT_FULL_TREBLE=false (which may be the case for targets without the usual set of hardware interfaces, such as the mini targets being added in https://r.android.com/1966051). Setting ro.product.first_api_level is necessary for devices with newer kernels to boot because it controls which metadata encryption format is used, and an old format that is incompatible with new kernels is used by default (see commit 4073c0b5241b635cb59e9e8a75ddcc783b5a99ce in system/vold). There also appear to be e.g. bionic tests that check this property. So it seems reasonable to set it even if PRODUCT_FULL_TREBLE is false. To begin with, stop adding it to ADDITIONAL_SYSTEM_PROPERTIES. There's basically no point in adding it there because it will be filtered out by the property blocklist for the system partition, whether PRODUCT_FULL_TREBLE is true or false. This lets us remove the blocklist entry, which causes ro.product.first_api_level to appear in /system/build.prop via ADDITIONAL_VENDOR_PROPERTIES on PRODUCT_FULL_TREBLE=false targets. Bug: 217455793 Change-Id: I8c07baf9d308ea734ffed5d9b1776b60cdbf3435
2022-02-19 04:17:04 +01:00
$(PRODUCT_SYSTEM_PROPERTY_BLACKLIST),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(empty),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty)))
Rule for system/build.prop is also from macro Like other <partition>/build.prop files, the build rule for system/build.prop is also created using the build-properties macro. system/build.prop has a few number of auto-generate properties that the macro doesn't create. Those properties are emitted to intermediate files using manually crafted rules, the paths to the files are fed to the macro, where their contents are copied to system/build.prop. This change also refactors the code fragment that defines BUILD_* variables that identifes the given build. Bug: 117892318 Test: m Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-05-25 20:18:36 +02:00
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
# -----------------------------------------------------------------
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
# vendor/build.prop
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
#
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
_prop_files_ := $(if $(TARGET_VENDOR_PROP),\
$(TARGET_VENDOR_PROP),\
$(wildcard $(TARGET_DEVICE_DIR)/vendor.prop))
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
ro.build.expect.* sysprops are created in a separate rule This change is required to unify the build rules for */build.prop files; The rules shouldn't have partition-specific actions. Bug: 117892318 Test: m Manually inspect ro.build.expect.[bootloader|baseband] props in vendor/build.prop Change-Id: I3b29b2728f779a9d7e1d71a5aa69b02ea940b3c6
2020-05-25 10:56:09 +02:00
android_info_prop := $(call intermediates-dir-for,ETC,android_info_prop)/android_info.prop
$(android_info_prop): $(INSTALLED_ANDROID_INFO_TXT_TARGET)
cat $< | grep 'require version-' | sed -e 's/require version-/ro.build.expect./g' > $@
Fix typo in sysprop.mk and Changes.md android_info_pro -> android_info_prop partititon -> partition PRODUCT_SYSTEM_PROPERITES -> PRODUCT_SYSTEM_PROPERTIES Test: build and manual test Signed-off-by: Donghyun Jo <donghyun.jo@samsung.com> Change-Id: I0b7f0566aaa5ce8844003bb4f373389c20ddeb88
2021-03-02 00:51:03 +01:00
_prop_files_ += $(android_info_prop)
ro.build.expect.* sysprops are created in a separate rule This change is required to unify the build rules for */build.prop files; The rules shouldn't have partition-specific actions. Bug: 117892318 Test: m Manually inspect ro.build.expect.[bootloader|baseband] props in vendor/build.prop Change-Id: I3b29b2728f779a9d7e1d71a5aa69b02ea940b3c6
2020-05-25 10:56:09 +02:00
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
ifdef property_overrides_split_enabled
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
# Order matters here. When there are duplicates, the last one wins.
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter
_prop_vars_ := \
ADDITIONAL_VENDOR_PROPERTIES \
Organize product vars for adding properties Properties for <partition>/build.prop are now added via PRODUCT_<PARTITION>_PROPERTIES. PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES will be deprecated. PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new variable. For other partitions (odm, system_ext, product), there is no change. Exempt-From-Owner-Approval: cherry-pick from internal master Bug: 117892318 Test: m Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44 (cherry picked from commit ad810b6dae32a42a828dfbddcaeec89f295d695e) Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-05-29 10:50:03 +02:00
PRODUCT_VENDOR_PROPERTIES
# TODO(b/117892318): deprecate this
_prop_vars_ += \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES \
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
PRODUCT_PROPERTY_OVERRIDES
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
else
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
_prop_vars_ :=
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
endif
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
INSTALLED_VENDOR_BUILD_PROP_TARGET := $(TARGET_OUT_VENDOR)/build.prop
$(eval $(call build-properties,\
vendor,\
$(INSTALLED_VENDOR_BUILD_PROP_TARGET),\
$(_prop_files_),\
$(_prop_vars_),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(PRODUCT_VENDOR_PROPERTY_BLACKLIST),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(empty),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty)))
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
# -----------------------------------------------------------------
Move build.prop to ./etc subdir for some partitions build.prop files under system_ext, product, and odm partitions are moved to the ./etc subdirectory. This is to be in-line with the established practice of having all configuration files under ./etc subdir. build.prop doesn't need to be an exception. However, system/build.prop and vendor/build.prop were not moved because there are a lot of apps and tools that depend on the path. Bug: 158735147 Test: device has build.prop under ./etc and is bootable Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-06-29 03:46:22 +02:00
# product/etc/build.prop
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
#
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
_prop_files_ := $(if $(TARGET_PRODUCT_PROP),\
$(TARGET_PRODUCT_PROP),\
$(wildcard $(TARGET_DEVICE_DIR)/product.prop))
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
# Order matters here. When there are duplicates, the last one wins.
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter
_prop_vars_ := \
ADDITIONAL_PRODUCT_PROPERTIES \
PRODUCT_PRODUCT_PROPERTIES
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
Move build.prop to ./etc subdir for some partitions build.prop files under system_ext, product, and odm partitions are moved to the ./etc subdirectory. This is to be in-line with the established practice of having all configuration files under ./etc subdir. build.prop doesn't need to be an exception. However, system/build.prop and vendor/build.prop were not moved because there are a lot of apps and tools that depend on the path. Bug: 158735147 Test: device has build.prop under ./etc and is bootable Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-06-29 03:46:22 +02:00
INSTALLED_PRODUCT_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT)/etc/build.prop
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
ifdef PRODUCT_OEM_PROPERTIES
import_oem_prop := $(call intermediates-dir-for,ETC,import_oem_prop)/oem.prop
$(import_oem_prop):
$(hide) echo "####################################" >> $@; \
echo "# PRODUCT_OEM_PROPERTIES" >> $@; \
echo "####################################" >> $@;
$(hide) $(foreach prop,$(PRODUCT_OEM_PROPERTIES), \
echo "import /oem/oem.prop $(prop)" >> $@;)
_footers_ := $(import_oem_prop)
else
_footers_ :=
endif
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
# Skip common /product properties generation if device released before R and
# has no product partition. This is the first part of the check.
ifeq ($(call math_lt,$(if $(PRODUCT_SHIPPING_API_LEVEL),$(PRODUCT_SHIPPING_API_LEVEL),30),30), true)
_skip_common_properties := true
endif
# The second part of the check - always generate common properties for the
# devices with product partition regardless of shipping level.
ifneq ($(BOARD_USES_PRODUCTIMAGE),)
_skip_common_properties :=
endif
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(eval $(call build-properties,\
product,\
$(INSTALLED_PRODUCT_BUILD_PROP_TARGET),\
$(_prop_files_),\
$(_prop_vars_),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(_footers_),\
$(_skip_common_properties)))
_skip_common_properties :=
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
# ----------------------------------------------------------------
build.prop for ODM partition is under ./etc subdir build.prop for the ODM partition should be placed under ./etc directory to support GSI. For detailed reasons, see I0733c277baa67c549bb45599abb70aba13fbdbcf The path was changed to /odm/build.prop during the recent refactoring around build.prop filems and this change fixes the mistake. Bug: 132128501 Test: check if odm/etc/build.prop is created Change-Id: Icc2c564250aa08786f32294a839cc81e86b7d368
2020-06-26 02:56:31 +02:00
# odm/etc/build.prop
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
#
_prop_files_ := $(if $(TARGET_ODM_PROP),\
$(TARGET_ODM_PROP),\
$(wildcard $(TARGET_DEVICE_DIR)/odm.prop))
# Order matters here. When there are duplicates, the last one wins.
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter
_prop_vars_ := \
ADDITIONAL_ODM_PROPERTIES \
PRODUCT_ODM_PROPERTIES
build.prop for ODM partition is under ./etc subdir build.prop for the ODM partition should be placed under ./etc directory to support GSI. For detailed reasons, see I0733c277baa67c549bb45599abb70aba13fbdbcf The path was changed to /odm/build.prop during the recent refactoring around build.prop filems and this change fixes the mistake. Bug: 132128501 Test: check if odm/etc/build.prop is created Change-Id: Icc2c564250aa08786f32294a839cc81e86b7d368
2020-06-26 02:56:31 +02:00
INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/etc/build.prop
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(eval $(call build-properties,\
odm,\
$(INSTALLED_ODM_BUILD_PROP_TARGET),\
Fix typo for ODM prop files _prop_files is missing a trailing _ Bug: 195034733 Test: manual - check that expected prop files are in the image Change-Id: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
2021-07-30 10:38:36 +02:00
$(_prop_files_),\
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(_prop_vars_),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(empty),\
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(empty)))
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
Add vendor_dlkm/etc/build.prop Test: builds and manual inspect Bug: 156020364 Change-Id: Ic7606bc3cd8770ec56ddc7bea86c88625c38f32d
2020-06-26 02:00:27 +02:00
# ----------------------------------------------------------------
# vendor_dlkm/etc/build.prop
#
INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_VENDOR_DLKM)/etc/build.prop
$(eval $(call build-properties,\
vendor_dlkm,\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET),\
$(empty),\
$(empty),\
$(empty),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(empty),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty)))
Add vendor_dlkm/etc/build.prop Test: builds and manual inspect Bug: 156020364 Change-Id: Ic7606bc3cd8770ec56ddc7bea86c88625c38f32d
2020-06-26 02:00:27 +02:00
Add odm_dlkm/etc/build.prop Test: build and manual test Bug: 156020364 Change-Id: I0b22280362fec499af5ff063a5984ed17131d89d
2020-07-16 02:02:07 +02:00
# ----------------------------------------------------------------
# odm_dlkm/etc/build.prop
#
INSTALLED_ODM_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM_DLKM)/etc/build.prop
$(eval $(call build-properties,\
odm_dlkm,\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(INSTALLED_ODM_DLKM_BUILD_PROP_TARGET),\
$(empty),\
$(empty),\
$(empty),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(empty),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty)))
Add odm_dlkm/etc/build.prop Test: build and manual test Bug: 156020364 Change-Id: I0b22280362fec499af5ff063a5984ed17131d89d
2020-07-16 02:02:07 +02:00
core & tools: system_dlkm: add dynamic partition Converts existing static partition support to a dynamic partition. Bug: 200082547 Test: TH Signed-off-by: Ramji Jiyani <ramjiyani@google.com> Change-Id: Ifd6d0c2a04e947b16f8b241e99cca594a1d315ae
2022-01-27 08:05:08 +01:00
# ----------------------------------------------------------------
# system_dlkm/build.prop
#
INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_DLKM)/etc/build.prop
$(eval $(call build-properties,\
system_dlkm,\
$(INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET),\
$(empty),\
$(empty),\
$(empty),\
$(empty),\
$(empty)))
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
# -----------------------------------------------------------------
Move build.prop to ./etc subdir for some partitions build.prop files under system_ext, product, and odm partitions are moved to the ./etc subdirectory. This is to be in-line with the established practice of having all configuration files under ./etc subdir. build.prop doesn't need to be an exception. However, system/build.prop and vendor/build.prop were not moved because there are a lot of apps and tools that depend on the path. Bug: 158735147 Test: device has build.prop under ./etc and is bootable Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-06-29 03:46:22 +02:00
# system_ext/etc/build.prop
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
#
_prop_files_ := $(if $(TARGET_SYSTEM_EXT_PROP),\
$(TARGET_SYSTEM_EXT_PROP),\
$(wildcard $(TARGET_DEVICE_DIR)/system_ext.prop))
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
# Order matters here. When there are duplicates, the last one wins.
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter
_prop_vars_ := PRODUCT_SYSTEM_EXT_PROPERTIES
Move most of the sysprop generation rules to sysprop.mk There is no change in functionality. This change just changes the location of the code. Bug: 117892318 Test: m Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 07:31:30 +02:00
Move build.prop to ./etc subdir for some partitions build.prop files under system_ext, product, and odm partitions are moved to the ./etc subdirectory. This is to be in-line with the established practice of having all configuration files under ./etc subdir. build.prop doesn't need to be an exception. However, system/build.prop and vendor/build.prop were not moved because there are a lot of apps and tools that depend on the path. Bug: 158735147 Test: device has build.prop under ./etc and is bootable Change-Id: I37c79f7337680f92406d9e196e5762bb8e7da5d8
2020-06-29 03:46:22 +02:00
INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/etc/build.prop
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(eval $(call build-properties,\
system_ext,\
$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET),\
$(_prop_files_),\
$(_prop_vars_),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(empty),\
<partition>/build.prop rules are defined using macro The macro `build-properties' is defined to generate build rules to create <partition>/build.prop. build.prop files in all partitions except for the system partition are now build using the macro. system partition will use the macro in the following changes. Bug: 117892318 Test: m Change-Id: Ibed9c96dac4366251ec59a0b1317aa92f501c9a3
2020-05-25 17:21:20 +02:00
$(empty)))
Add <ramdisk>/system/etc/ramdisk/build.prop. Add a build.prop file for ramdisk. Properties uses the name ro.[product.]bootimage*. These ro.[product.]bootimage.* properties are also included in recovery properties. The file is installed to system/etc/ramdisk/build.prop under ramdisk. On devices with dedicated recovery partition, the file is installed to ramdisk/, which is installed to the ramdisk in the boot image. The file is NOT installed to recovery/root to prevent collision. On devices with recovery_as_boot, in addition to ramdisk/, it is also installed to recovery/root, which is installed to the ramdisk in the boot image. Test: m bootimage and inspect output Bug: 169169031 Bug: 162623577 Bug: 170411692 Bug: 170364317 Change-Id: Ica6515b2a4e0f4a7fe4440434a3d7085fde64387
2020-09-25 03:18:26 +02:00
# ----------------------------------------------------------------
# ramdisk/boot/etc/build.prop
#
RAMDISK_BUILD_PROP_REL_PATH := system/etc/ramdisk/build.prop
INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RAMDISK_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)
$(eval $(call build-properties,\
bootimage,\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\
$(empty),\
$(empty),\
$(empty),\
Skip generate-common-build-props for older devices without /product Common ro.product properties are always generated for the product partition, even if it is not present. This was introduced for the R release with Ia88c8efecb18db9c27baa466e492bfd898b581d3 "Generate product build props always" commit. It violates CDD requirements for the devices which were released earlier. Add optional parameter to build-properties which allows to skip the common properies generation and product partition specific checks to make sure common properties are not generated for the devices released before R and without product partition. Test: manual, build product/etc/build.prop for shipping levels 28, 30 and for the devices with and without product partitions Bug: 174677451 Change-Id: Ia3275d7229d0a873e0a4f1d1ea7a25c758c85bb9
2020-12-15 14:38:32 +01:00
$(empty),\
Fix the order of loading OEM properties Move the OEM property imports so that they take higher precedence over product and can still be overridden by factory properties. Bug: 171304788 Test: manual Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-11 15:25:37 +01:00
$(empty)))
Reference in a new issue Copy permalink