commit 7eaf9b58ecbaae486e2ecf98fa803c30f10fc3dc
author Justin Yun <justinyun@google.com> Fri Jun 28 14:28:00 2019 +0900
committer Justin Yun <justinyun@google.com> Tue Jul 09 23:34:17 2019 +0000
tree 6160aa2b78e00dba7f4b39ce4cc4f0367ade845f
parent 3f407fcc37b401c91784700c0a691ba8b1f7ef15

Rename product_services to system_ext

Update ld.config.txt and init.

Bug: 134359158
Test: make && check boot and ld.config.txt file
Change-Id: Ie1dce42e690414fb45b26759506ea7f64d06740d

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 675f3e5..c45d94d 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -139,12 +139,12 @@
         if (!parser.ParseConfig("/system/etc/init")) {
             late_import_paths.emplace_back("/system/etc/init");
         }
+        // late_import is available only in Q and earlier release. As we don't
+        // have system_ext in those versions, skip late_import for system_ext.
+        parser.ParseConfig("/system_ext/etc/init");
         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");
         }