commit ccab04e5b545ea441ffeb98cf2e16d7ebb887b15
author Jooyung Han <jooyung@google.com> Fri Aug 07 23:21:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 07 23:21:55 2020 +0000
tree f2fa1c79bb7788ae803f90f168d263923cf817a3
parent 0198ce0ca78427868e1a85e46f461341efd840d0
parent f7c2585f6d6a24f504df1d66db0b87e4bb5b9395

Merge "Fix the order for boot scripts scanning"

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index cb5bbba..7d00538 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -310,14 +310,14 @@
         // 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("/vendor/etc/init")) {
+            late_import_paths.emplace_back("/vendor/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");
+        if (!parser.ParseConfig("/product/etc/init")) {
+            late_import_paths.emplace_back("/product/etc/init");
         }
     } else {
         parser.ParseConfig(bootscript);