Revert "init: Run vendor-specific init hooks on post-fs"

This reverts commit 6e152c2.

 * Breaks __system_property_update

Change-Id: I2466c03837b5755befb797343ed6fb771ae7b582

init/README.md

@@ -496,9 +496,6 @@ Commands
 > Loads persistent properties when /data has been decrypted.
   This is included in the default init.rc.
 
-`vendor_load_properties`
-> Update with vendor-specific property runtime overrides
-
 `loglevel <level>`
 > Sets the kernel log level to level. Properties are expanded within _level_.
 

init/builtins.cpp

@@ -72,7 +72,6 @@
 #include "service.h"
 #include "subcontext.h"
 #include "util.h"
-#include "vendor_init.h"
 
 using namespace std::literals::string_literals;
 
@@ -1059,11 +1058,6 @@ static Result<Success> do_load_system_props(const BuiltinArguments& args) {
     return Success();
 }
 
-static Result<Success> do_vendor_load_properties(const BuiltinArguments& args) {
-    vendor_load_properties();
-    return Success();
-}
-
 static Result<Success> do_wait(const BuiltinArguments& args) {
     auto timeout = kCommandRetryTimeout;
     if (args.size() == 3) {
@@ -1227,7 +1221,6 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
         {"interface_stop",          {1,     1,    {false,  do_interface_stop}}},
         {"load_persist_props",      {0,     0,    {false,  do_load_persist_props}}},
         {"load_system_props",       {0,     0,    {false,  do_load_system_props}}},
-        {"vendor_load_properties",  {0,     0,    {false,  do_vendor_load_properties}}},
         {"loglevel",                {1,     1,    {false,  do_loglevel}}},
         {"mark_post_data",          {0,     0,    {false,  do_mark_post_data}}},
         {"mkdir",                   {1,     4,    {true,   do_mkdir}}},

init/property_service.cpp

@@ -64,6 +64,7 @@
 #include "selinux.h"
 #include "subcontext.h"
 #include "util.h"
+#include "vendor_init.h"
 
 using namespace std::literals;
 
@@ -912,6 +913,9 @@ void property_load_boot_defaults(bool load_debug_prop) {
         }
     }
 
+    // Update with vendor-specific property runtime overrides
+    vendor_load_properties();
+
     property_initialize_ro_product_props();
     property_derive_build_fingerprint();
 

rootdir/init.rc

@@ -350,8 +350,6 @@ on early-fs
     start vold
 
 on post-fs
-    vendor_load_properties
-
     exec - system system -- /system/bin/vdc checkpoint markBootAttempt
 
     # Once everything is setup, no need to modify /.