commit 232bd340550afb07daee2761eda049542b64cbef
author Ivan Podogov <ginkage@google.com> Thu Apr 12 03:29:03 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 12 03:29:03 2018 -0700
tree 81dbdb4dc93f74b733398b434a0423fcecda6070
parent 8dba7bcddcfbbbdbb50dd3156df75a77f063099e
parent 0cf73852fc2359a166806d39da84367ba0c42a96

Merge "Add vendor properties blacklist" am: 2e2290cf1a am: 869d4e5869
am: 0cf73852fc

Change-Id: Ia560779c8d7c66d0f886b1e29d8e281d4beba55b

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index b01a619..c7f4c31 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -429,8 +429,8 @@
 	        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

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index c5d6299..1a15c9f 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -164,6 +164,7 @@
     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 \