Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27288f97 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "init: move `MarkServicesUpdate` later" into main am: e90d93ab am:... 

Merge "init: move `MarkServicesUpdate` later" into main am: e90d93ab am: ae91cd0d am: 83a2197c am: 85d95285

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2680615



Change-Id: Ib6d6f989481affd00eb2b2b26dd5236706a5c6fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d790e57 85d95285

init/builtins.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,6 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) { 
        return create_dirs.error();

    }

    auto parse_configs = ParseApexConfigs(/*apex_name=*/"");

    ServiceList::GetInstance().MarkServicesUpdate();

    if (!parse_configs.ok()) {

        return parse_configs.error();

    }
@@ -1307,6 +1306,8 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) { 
        return update_linker_config.error();

    }



    // Now start delayed services

    ServiceList::GetInstance().MarkServicesUpdate();

    return {};

}