| commit | 2e80113ad211e01055df06fd52b37c1fea10e18e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Aug 14 18:03:31 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Aug 14 18:03:31 2020 +0000 |
| tree | 6b4ac6054101d110c299594f331922ccec4df3bb | |
| parent | 84b82254297f11e819886d07676e4c338dfa45b6 [diff] | |
| parent | 04714da51cb0dcc81dd447e3b36fbb04dbf01b39 [diff] |
Merge "Include vendor overrides in system prop if not split"
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_ := \