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

Commit a1b35b54 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge changes I9248fbaf,Ifd795776,I201109b5 

am: 21d98807

Change-Id: Ib0376b04085cb9485ebafe9ba57c2e29b28ec14a
parents b784b00e 21d98807

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_stubs.cpp

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ int setgroups(size_t __size, const gid_t* __list) { 
namespace android {

namespace init {



// init.h

std::string default_console = "/dev/console";



// property_service.h

bool CanReadProperty(const std::string& source_context, const std::string& name) {

    return true;

init/host_init_stubs.h

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ int setgroups(size_t __size, const gid_t* __list); 
namespace android {

namespace init {



// init.h

extern std::string default_console;



// property_service.h

bool CanReadProperty(const std::string& source_context, const std::string& name);

extern uint32_t (*property_set)(const std::string& name, const std::string& value);

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"