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

Commit 47f486dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename android_info.prop to android-info.prop" into main am: ec297b22 

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



Change-Id: I88a4fea50d6f0da69001b03f1df15996b959d87c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2df7c7b3 ec297b22

core/sysprop.mk

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 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.

        # 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)),\
@@ -183,7 +183,7 @@ _prop_files_ := $(if $(TARGET_VENDOR_PROP),\ 
    $(TARGET_VENDOR_PROP),\

    $(wildcard $(TARGET_DEVICE_DIR)/vendor.prop))



android_info_prop := $(call intermediates-dir-for,ETC,android_info_prop)/android_info.prop

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' > $@