Merge "Moving /odm/build.prop to /odm/etc/buid.prop"
am: 41b46710e9
Change-Id: I6b7003a1b7da406a256f11f46acc58d3199ee532
This commit is contained in:
commit
45842f3885
|
@ -634,6 +634,10 @@ $(call add-clean-step, rm -rf $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar)
|
|||
$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/build_verity_metadata.py)
|
||||
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libc_malloc*)
|
||||
|
||||
# Move odm build.prop to /odm/etc/.
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)
|
||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)
|
||||
# ************************************************
|
||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||
# ************************************************
|
||||
|
|
|
@ -567,7 +567,7 @@ endif # BOARD_USES_PRODUCTIMAGE
|
|||
|
||||
# ----------------------------------------------------------------
|
||||
# odm build.prop
|
||||
INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/build.prop
|
||||
INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/etc/build.prop
|
||||
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_ODM_BUILD_PROP_TARGET)
|
||||
|
||||
FINAL_ODM_BUILD_PROPERTIES += \
|
||||
|
|
|
@ -415,8 +415,14 @@ def LoadInfoDict(input_file, repacking=False):
|
|||
# Tries to load the build props for all partitions with care_map, including
|
||||
# system and vendor.
|
||||
for partition in PARTITIONS_WITH_CARE_MAP:
|
||||
d["{}.build.prop".format(partition)] = LoadBuildProp(
|
||||
partition_prop = "{}.build.prop".format(partition)
|
||||
d[partition_prop] = LoadBuildProp(
|
||||
read_helper, "{}/build.prop".format(partition.upper()))
|
||||
# Some partition might use /<partition>/etc/build.prop as the new path.
|
||||
# TODO: try new path first when majority of them switch to the new path.
|
||||
if not d[partition_prop]:
|
||||
d[partition_prop] = LoadBuildProp(
|
||||
read_helper, "{}/etc/build.prop".format(partition.upper()))
|
||||
d["build.prop"] = d["system.build.prop"]
|
||||
|
||||
# Set up the salt (based on fingerprint or thumbprint) that will be used when
|
||||
|
|
|
@ -491,8 +491,10 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
|
|||
elif filename in ("SYSTEM/build.prop",
|
||||
"VENDOR/build.prop",
|
||||
"SYSTEM/vendor/build.prop",
|
||||
"ODM/build.prop",
|
||||
"VENDOR/odm/build.prop",
|
||||
"ODM/build.prop", # legacy
|
||||
"ODM/etc/build.prop",
|
||||
"VENDOR/odm/build.prop", # legacy
|
||||
"VENDOR/odm/etc/build.prop",
|
||||
"PRODUCT/build.prop",
|
||||
"SYSTEM/product/build.prop",
|
||||
"PRODUCT_SERVICES/build.prop",
|
||||
|
|
Loading…
Reference in New Issue