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

Commit 2aeb1add authored by Tom Cherry's avatar Tom Cherry
Browse files

Split out ServiceList and ServiceParser from service.cpp/.h 

These always should have been in their own files.

Test: build
Change-Id: I201109b5ee63016e78901bbfd404846d45e1d4e6
parent c0349199

init/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ cc_library_static { 
        "selabel.cpp",

        "selinux.cpp",

        "service.cpp",

        "service_list.cpp",

        "service_parser.cpp",

        "service_utils.cpp",

        "sigchld_handler.cpp",

        "subcontext.cpp",
@@ -260,6 +262,8 @@ cc_binary { 
        "rlimit_parser.cpp",

        "tokenizer.cpp",

        "service.cpp",

        "service_list.cpp",

        "service_parser.cpp",

        "service_utils.cpp",

        "subcontext.cpp",

        "subcontext.proto",

init/builtins.cpp

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#include "selabel.h"

#include "selinux.h"

#include "service.h"

#include "service_list.h"

#include "subcontext.h"

#include "util.h"

init/host_init_verifier.cpp

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include "parser.h"

#include "result.h"

#include "service.h"

#include "service_list.h"

#include "service_parser.h"



#define EXCLUDE_FS_CONFIG_STRUCTURES

#include "generated_android_ids.h"

init/init.cpp

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
#include "security.h"

#include "selabel.h"

#include "selinux.h"

#include "service.h"

#include "service_parser.h"

#include "sigchld_handler.h"

#include "util.h"

init/init.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "action.h"

#include "action_manager.h"

#include "parser.h"

#include "service.h"

#include "service_list.h"



namespace android {

namespace init {