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
diff --git a/core/sysprop.mk b/core/sysprop.mk
index f1311ed..002e1b5 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-# sysprop.mk defines rules for generating <partition>/build.prop files
+# sysprop.mk defines rules for generating <partition>/[etc/]build.prop files
# -----------------------------------------------------------------
# property_overrides_split_enabled
@@ -59,7 +59,7 @@
endef
-# Rule for generating <partition>/build.prop file
+# Rule for generating <partition>/[etc/]build.prop file
#
# $(1): partition name
# $(2): path to the output
@@ -313,7 +313,6 @@
$(_prop_files_),$(_prop_vars_),\
$(_blacklist_names_)))
-
# -----------------------------------------------------------------
# vendor/build.prop
#
@@ -351,7 +350,7 @@
$(PRODUCT_VENDOR_PROPERTY_BLACKLIST)))
# -----------------------------------------------------------------
-# product/build.prop
+# product/etc/build.prop
#
_prop_files_ := $(if $(TARGET_PRODUCT_PROP),\
@@ -364,7 +363,7 @@
ADDITIONAL_PRODUCT_PROPERTIES \
PRODUCT_PRODUCT_PROPERTIES
-INSTALLED_PRODUCT_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT)/build.prop
+INSTALLED_PRODUCT_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT)/etc/build.prop
$(eval $(call build-properties,\
product,\
$(INSTALLED_PRODUCT_BUILD_PROP_TARGET),\
@@ -385,8 +384,6 @@
ADDITIONAL_ODM_PROPERTIES \
PRODUCT_ODM_PROPERTIES
-# Note the 'etc' sub directory. For the reason, see
-# I0733c277baa67c549bb45599abb70aba13fbdbcf
INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/etc/build.prop
$(eval $(call build-properties,\
odm,\
@@ -396,7 +393,7 @@
$(empty)))
# -----------------------------------------------------------------
-# system_ext/build.prop
+# system_ext/etc/build.prop
#
_prop_files_ := $(if $(TARGET_SYSTEM_EXT_PROP),\
$(TARGET_SYSTEM_EXT_PROP),\
@@ -406,7 +403,7 @@
# TODO(b/117892318): don't allow duplicates so that the ordering doesn't matter
_prop_vars_ := PRODUCT_SYSTEM_EXT_PROPERTIES
-INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/build.prop
+INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/etc/build.prop
$(eval $(call build-properties,\
system_ext,\
$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET),\