summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorDario Freni2018-05-25 10:07:19 -0500
committerDario Freni2018-07-26 11:27:28 -0500
commit361371009902150d332cb23575f5833a57cf0ef0 (patch)
tree7975ec21d6a7554d8c379ebfe7b716395b465182 /init
parent28fb130cbbd7c01ef706d5b6a5a9877b290f275c (diff)
downloadplatform-system-core-361371009902150d332cb23575f5833a57cf0ef0.tar.gz
platform-system-core-361371009902150d332cb23575f5833a57cf0ef0.tar.xz
platform-system-core-361371009902150d332cb23575f5833a57cf0ef0.zip
Add support for /product-services partition.
This CL is largely and adaptation of Ie996def20e25dc1afe0c74af2096af844934b2dc Bug: 80741439 Test: Successfully built product-services.img with one module in it, and flashed on device. Also successfully built image with /system/product-services and no dedicated /product-services partition. Change-Id: I1046dfe19bf874da929c9131b76a1f85422fbb80 Merged-In: I1046dfe19bf874da929c9131b76a1f85422fbb80
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