gistfile1.mak

diff --git a/core/Makefile b/core/Makefile
index a1428ed..ec64ced 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -117,10 +117,9 @@ endef
 define default-locale-region
 $(word 3, 3, $(call default-locale, $(1)))
 endef
-
 BUILDINFO_SH := build/tools/buildinfo.sh
 $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE)
-       @echo Target buildinfo: $@
+       @echo Target buildinfo: $(PRODUCT_OUT)/myset.prop
        @mkdir -p $(dir $@)
        $(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \
                        TARGET_DEVICE="$(TARGET_DEVICE)" \
@@ -145,6 +144,9 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE)
                        TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \
                        TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \
                bash $(BUILDINFO_SH) > $@
+       $(hide) if [ -f $(PRODUCT_OUT)/myset.prop ]; then \
+                  cat $(PRODUCT_OUT)/myset.prop >> $@; \
+                fi
        $(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \
                  cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \