diff options
| author | Jaekyun Seok <jaekyun@google.com> | 2017-11-28 12:10:10 +0900 |
|---|---|---|
| committer | Jaekyun Seok <jaekyun@google.com> | 2018-01-25 09:37:20 +0900 |
| commit | dff165d3a2db868689bae12db1ed8b3c74fa7d60 (patch) | |
| tree | 6237fc0bf1607237788962972b1b47ed4170f003 /init/init.cpp | |
| parent | ccb9960bebe4e8ec7d674d8d1b778e5cd9669b48 (diff) | |
| download | system_core-dff165d3a2db868689bae12db1ed8b3c74fa7d60.tar.gz system_core-dff165d3a2db868689bae12db1ed8b3c74fa7d60.tar.bz2 system_core-dff165d3a2db868689bae12db1ed8b3c74fa7d60.zip | |
Support /product partition
This CL will enable reading /product/build.prop and add product paths
into ld.config.txt.in.
Bug: 64195575
Test: tested with 'PRODUCT_PRODUCT_PROPERTIES := ro.product.abc=abc' on
sailfish
Change-Id: Ie996def20e25dc1afe0c74af2096af844934b2dc
Diffstat (limited to 'init/init.cpp')
| -rw-r--r-- | init/init.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/init/init.cpp b/init/init.cpp index 95f272b8d..79623c333 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -110,12 +110,15 @@ static void LoadBootScripts(ActionManager& action_manager, ServiceList& service_ if (!parser.ParseConfig("/system/etc/init")) { late_import_paths.emplace_back("/system/etc/init"); } - if (!parser.ParseConfig("/vendor/etc/init")) { - late_import_paths.emplace_back("/vendor/etc/init"); + if (!parser.ParseConfig("/product/etc/init")) { + late_import_paths.emplace_back("/product/etc/init"); } if (!parser.ParseConfig("/odm/etc/init")) { late_import_paths.emplace_back("/odm/etc/init"); } + if (!parser.ParseConfig("/vendor/etc/init")) { + late_import_paths.emplace_back("/vendor/etc/init"); + } } else { parser.ParseConfig(bootscript); } |