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

Commit 92c236e4 authored by Vic Yang's avatar Vic Yang Committed by Tom Cherry
Browse files

init: Refactor selinux.h/cpp 

This change factors out functions that handle selabels from
selinux.h/cpp into selabel.h/cpp.  This allows util.cpp to be used by
the upcoming native zygote without a bunch of define flags that are
required for selinux.cpp.

Bug: 133443795
Test: Build and boot cuttlefish.
Change-Id: Ie238a96c6407c6698a605dd8803c1727abfaae7b
parent e20f357f

init/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ cc_library_static { 
        "reboot.cpp",

        "reboot_utils.cpp",

        "security.cpp",

        "selabel.cpp",

        "selinux.cpp",

        "service.cpp",

        "sigchld_handler.cpp",

init/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ LOCAL_SRC_FILES := \ 
    first_stage_mount.cpp \

    mount_namespace.cpp \

    reboot_utils.cpp \

    selabel.cpp \

    selinux.cpp \

    switch_root.cpp \

    uevent_listener.cpp \

init/builtins.cpp

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

#include "reboot.h"

#include "rlimit_parser.h"

#include "selabel.h"

#include "selinux.h"

#include "service.h"

#include "subcontext.h"

init/devices.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <selinux/android.h>

#include <selinux/selinux.h>



#include "selinux.h"

#include "selabel.h"

#include "util.h"



#ifdef _INIT_INIT_H

init/init.cpp

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

#include "reboot_utils.h"

#include "security.h"

#include "selabel.h"

#include "selinux.h"

#include "sigchld_handler.h"

#include "util.h"