diff options
Diffstat (limited to 'init/property_service.cpp')
| -rw-r--r-- | init/property_service.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp index 0c4a3c4989..a1e0969ede 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -632,10 +632,11 @@ static void LoadProperties(char* data, const char* filter, const char* filename, char *key, *value, *eol, *sol, *tmp, *fn; size_t flen = 0; - static constexpr const char* const kVendorPathPrefixes[3] = { + static constexpr const char* const kVendorPathPrefixes[4] = { "/vendor", "/odm", "/vendor_dlkm", + "/odm_dlkm", }; const char* context = kInitContext; @@ -941,6 +942,7 @@ void PropertyLoadBootDefaults() { // } load_properties_from_file("/vendor/build.prop", nullptr, &properties); load_properties_from_file("/vendor_dlkm/etc/build.prop", nullptr, &properties); + load_properties_from_file("/odm_dlkm/etc/build.prop", nullptr, &properties); load_properties_from_partition("odm", /* support_legacy_path_until */ 28); load_properties_from_partition("product", /* support_legacy_path_until */ 30); @@ -992,7 +994,7 @@ void CreateSerializedPropertyInfo() { &property_infos)) { return; } - // Don't check for failure here, so we always have a sane list of properties. + // Don't check for failure here, since we don't always have all of these partitions. // E.g. In case of recovery, the vendor partition will not have mounted and we // still need the system / platform properties to function. if (access("/system_ext/etc/selinux/system_ext_property_contexts", R_OK) != -1) { |