Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f1e7aab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Normalize filepath comment for gen files in build.prop" into main am:... 

Merge "Normalize filepath comment for gen files in build.prop" into main am: 41bf4647 am: aed107a9

Original change: https://android-review.googlesource.com/c/platform/build/+/3413209



Change-Id: I369a9c502cbd8823bcc4ccbc6a2704bd03fa9866
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 267a46be aed107a9

core/sysprop.mk

+9 −1
Original line number Diff line number Diff line
@@ -123,11 +123,19 @@ $(2): $(POST_PROCESS_PROPS) $(INTERNAL_BUILD_ID_MAKEFILE) $(3) $(6) $(BUILT_KERN 
ifneq ($(strip $(7)), true)

	$(hide) $$(call generate-common-build-props,$(call to-lower,$(strip $(1))),$$@)

endif

        # Make and Soong use different intermediate files to build vendor/build.prop.

        # Although the sysprop contents are same, the absolute paths of android_info.prop are different.

        # Print the filename for the intermediate files (files in OUT_DIR).

        # This helps with validating mk->soong migration of android partitions.

	$(hide) $(foreach file,$(strip $(3)),\

	    if [ -f "$(file)" ]; then\

	        echo "" >> $$@;\

	        echo "####################################" >> $$@;\

	        $(if $(filter $(OUT_DIR)/%,$(file)), \

		echo "# from $(notdir $(file))" >> $$@;\

		,\

		echo "# from $(file)" >> $$@;\

		)\

	        echo "####################################" >> $$@;\

	        cat $(file) >> $$@;\

	    fi;)