summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorTreehugger Robot2018-07-27 12:15:05 -0500
committerGerrit Code Review2018-07-27 12:15:05 -0500
commit18be1e2f7e27de79b2a3c2197b8bb30c958a5644 (patch)
tree84e2a2307f6cb9c17eb072a6b6a455dd680985dc /init
parent78f5431ff1e369fa583caf92c789dbccd7656de0 (diff)
parent361371009902150d332cb23575f5833a57cf0ef0 (diff)
downloadplatform-system-core-18be1e2f7e27de79b2a3c2197b8bb30c958a5644.tar.gz
platform-system-core-18be1e2f7e27de79b2a3c2197b8bb30c958a5644.tar.xz
platform-system-core-18be1e2f7e27de79b2a3c2197b8bb30c958a5644.zip
Merge "Add support for /product-services partition."
Diffstat (limited to 'init')
-rw-r--r--init/init.cpp3
-rw-r--r--init/property_service.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/init/init.cpp b/init/init.cpp
index 6569871b8..73194bdd9 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -119,6 +119,9 @@ static void LoadBootScripts(ActionManager& action_manager, ServiceList& service_
119 if (!parser.ParseConfig("/product/etc/init")) { 119 if (!parser.ParseConfig("/product/etc/init")) {
120 late_import_paths.emplace_back("/product/etc/init"); 120 late_import_paths.emplace_back("/product/etc/init");
121 } 121 }
122 if (!parser.ParseConfig("/product-services/etc/init")) {
123 late_import_paths.emplace_back("/product-services/etc/init");
124 }
122 if (!parser.ParseConfig("/odm/etc/init")) { 125 if (!parser.ParseConfig("/odm/etc/init")) {
123 late_import_paths.emplace_back("/odm/etc/init"); 126 late_import_paths.emplace_back("/odm/etc/init");
124 } 127 }
diff --git a/init/property_service.cpp b/init/property_service.cpp
index d1c427dba..c0d811fc6 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -691,6 +691,7 @@ void property_load_boot_defaults() {
691 } 691 }
692 } 692 }
693 load_properties_from_file("/product/build.prop", NULL); 693 load_properties_from_file("/product/build.prop", NULL);
694 load_properties_from_file("/product-services/build.prop", NULL);
694 load_properties_from_file("/odm/default.prop", NULL); 695 load_properties_from_file("/odm/default.prop", NULL);
695 load_properties_from_file("/vendor/default.prop", NULL); 696 load_properties_from_file("/vendor/default.prop", NULL);
696 697