From 2726211a7c843ccea3b345c0821290a5ee656d9b Mon Sep 17 00:00:00 2001 From: Vineeta Srivastava Date: Thu, 18 Sep 2014 14:34:00 -0700 Subject: [PATCH] Set oem_fingerprint_properties only when it is not empty. Add oem_fingerprint_properties to misc_info.txt only when it is not empty. Shamu does not have OEM specific OTA config and oem_fingerprint_properties does not need to be set in misc_info.txt. For sprout, it stays the same. Bug: 16635599 Change-Id: I7e6c6f5ce1f94f8f1b6da0c2f56bc67ff9fc0f1c --- core/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Makefile b/core/Makefile index 11ae7f5c2..d3fc6cc61 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1397,7 +1397,9 @@ endif $(hide) echo "update_rename_support=1" >> $(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)