commit 04714da51cb0dcc81dd447e3b36fbb04dbf01b39
author Garfield Tan <xutan@google.com> Thu Aug 13 15:21:32 2020 -0700
committer Garfield Tan <xutan@google.com> Thu Aug 13 18:42:43 2020 -0700
tree 90a515a4517cc0a215be87c9df37a5789f60907d
parent 9c81a78e972d2d99d8524a24cccf31e0808710d7

Include vendor overrides in system prop if not split

Bug: 163854285
Test: m on crosshatch. Vendor overrides are included in
system/build.prop on legacy devices.

Change-Id: Ib134f934de8546af3dff27312f6877eafe5ed22c

core/sysprop.mk

diff --git a/core/sysprop.mk b/core/sysprop.mk
index d01255f..73dbec7 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -300,7 +300,8 @@
 
 ifndef property_overrides_split_enabled
 _prop_vars_ += \
-    ADDITIONAL_VENDOR_PROPERTIES
+    ADDITIONAL_VENDOR_PROPERTIES \
+    PRODUCT_VENDOR_PROPERTIES
 endif
 
 _blacklist_names_ := \