Commit 5bd18feb authored Aug 14, 2020 by Treehugger Robot Committed by Automerger Merge Worker Aug 14, 2020

Merge "Include vendor overrides in system prop if not split" am: 2e80113a am: 0508bd68

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

Change-Id: I2ba4e4c2a169e9cfc29ce6ba7fe3f121e65feaa3

core/sysprop.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -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_ := \