Rename android_info.prop to android-info.prop
android_info.prop is used a prop file input to generate vendor's
build.prop file. Soong autogenerated partition uses an autogenerated
android_info.prop module, this CL makes the make built prop filename similar
to the soong module.
An alternative would be to fix the name of the soong module, but this CL
seems like a better alternative since the naming convention also matches
the android-info.txt file.
Test: verified that vendor/build.prop is similar between make and soong
Change-Id: Ia6d632636c05567386b2f1f1fa724255f73b8863
diff --git a/core/sysprop.mk b/core/sysprop.mk
index e4f994f..9a9f509 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -123,7 +123,7 @@
$(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 @@
$(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' > $@