From d572632f3d81608ebda57b2591562fa7e2c02518 Mon Sep 17 00:00:00 2001
From: Ivan Podogov <ginkage@google.com>
Date: Thu, 29 Mar 2018 15:22:33 +0100
Subject: [PATCH] Add vendor properties blacklist

This change allows removing some vendor properties from
(vendor|system/vendor)/build.prop file based on a blacklist.

For WearOS Unified Builds, which can change the product name depending on
the chosen locale, we use runtime-generated value for ro.build.fingerprint,
but since the ro.vendor.build.fingerprint cannot be generated the same way,
we always hit a "Mismatched fingerprints" error.

Bug: 71555551
Test: manual
Change-Id: Ifad793187e930a28fbf9325b03468c7ea86076b7
---
 core/Makefile   | 2 +-
 core/product.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/Makefile b/core/Makefile
index 9a761883e3..61ed94d952 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -427,8 +427,8 @@ ifdef property_overrides_split_enabled
 	        echo "#" >> $@;
 	$(hide) $(foreach line,$(FINAL_VENDOR_BUILD_PROPERTIES), \
 		echo "$(line)" >> $@;)
-	$(hide) build/make/tools/post_process_props.py $@
 endif  # property_overrides_split_enabled
+	$(hide) build/make/tools/post_process_props.py $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_PROPERTY_BLACKLIST)
 
 # -----------------------------------------------------------------
 # product build.prop
diff --git a/core/product.mk b/core/product.mk
index c5d62997df..1a15c9f080 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -164,6 +164,7 @@ _product_var_list := \
     PRODUCT_OEM_PROPERTIES \
     PRODUCT_SYSTEM_DEFAULT_PROPERTIES \
     PRODUCT_SYSTEM_PROPERTY_BLACKLIST \
+    PRODUCT_VENDOR_PROPERTY_BLACKLIST \
     PRODUCT_SYSTEM_SERVER_APPS \
     PRODUCT_SYSTEM_SERVER_JARS \
     PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK \