Merge "Include vendor overrides in system prop if not split" am: 2e80113ad2

Original change: https://android-review.googlesource.com/c/platform/build/+/1399399

Change-Id: I8c961466fe21223c441c422ba457c12427d840c0
This commit is contained in:
Treehugger Robot
2020-08-14 18:20:21 +00:00
committed by Automerger Merge Worker

View File

@@ -300,7 +300,8 @@ _prop_vars_ += \
ifndef property_overrides_split_enabled
_prop_vars_ += \
ADDITIONAL_VENDOR_PROPERTIES
ADDITIONAL_VENDOR_PROPERTIES \
PRODUCT_VENDOR_PROPERTIES
endif
_blacklist_names_ := \