am cfbd193d: am 2726211a: Set oem_fingerprint_properties only when it is not empty.

* commit 'cfbd193d354dd9bf33148919a4a82678ed81578b':
  Set oem_fingerprint_properties only when it is not empty.

diff --cc core/Makefile
index 21b7404,d3fc6cc..ff2afea
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -1419,11 -1395,12 +1419,13 @@@ endi
        $(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
        $(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
        $(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
 +      $(hide) echo "blockimgdiff_versions=1,2" >> $(zip_root)/META/misc_info.txt
  ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES),)
        # OTA scripts are only interested in fingerprint related properties
+ ifneq ($(filter ro.product.brand ro.product.name ro.product.device, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES)),)
        $(hide) echo "oem_fingerprint_properties=$(filter ro.product.brand ro.product.name ro.product.device, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES))" >> $(zip_root)/META/misc_info.txt
  endif
+ endif
        $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
        $(hide) ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)
        @# Zip everything up, preserving symlinks