Merge "property_contexts: split into platform and non-platform components"
diff --git a/libc/bionic/system_properties.cpp b/libc/bionic/system_properties.cpp
index d5f48d2..3d9aa6b 100644
--- a/libc/bionic/system_properties.cpp
+++ b/libc/bionic/system_properties.cpp
@@ -988,9 +988,8 @@
return items;
}
-static bool initialize_properties() {
- FILE* file = fopen("/property_contexts", "re");
-
+static bool initialize_properties_from_file(const char *filename) {
+ FILE* file = fopen(filename, "re");
if (!file) {
return false;
}
@@ -1034,6 +1033,27 @@
free(buffer);
fclose(file);
+
+ return true;
+}
+
+static bool initialize_properties() {
+ // If we do find /property_contexts, then this is being
+ // run as part of the OTA updater on older release that had
+ // /property_contexts - b/34370523
+ if (initialize_properties_from_file("/property_contexts")) {
+ return true;
+ }
+
+ // TODO: Change path to /system/property_contexts after b/27805372
+ if (!initialize_properties_from_file("/plat_property_contexts")) {
+ return false;
+ }
+
+ // TODO: Change path to /vendor/property_contexts after b/27805372
+ // device-specific property context is optional, so load if it exists.
+ initialize_properties_from_file("/nonplat_property_contexts");
+
return true;
}