commit 4fa866a4673877578f2aa9ab35353217eb2e39f4
author Dario Freni <dariofreni@google.com> Fri May 25 16:07:19 2018 +0100
committer Dario Freni <dariofreni@google.com> Mon Jul 23 16:14:36 2018 +0100
tree bfb010e3e7a37d5d4f67c55957f4595748cfebca
parent 9ad886c3cb1f738b644ac95c7b0d4fba8ce6de80

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

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 6569871..73194bd 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -119,6 +119,9 @@
         if (!parser.ParseConfig("/product/etc/init")) {
             late_import_paths.emplace_back("/product/etc/init");
         }
+        if (!parser.ParseConfig("/product-services/etc/init")) {
+            late_import_paths.emplace_back("/product-services/etc/init");
+        }
         if (!parser.ParseConfig("/odm/etc/init")) {
             late_import_paths.emplace_back("/odm/etc/init");
         }