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

Commit 40acb379 authored by Tom Cherry's avatar Tom Cherry
Browse files

Move watchdogd out of init 

We're moving past a world where static executables are needed,
including watchdogd, so treat this like any other executable and place
it in /system/bin.

Bug: 73660730
Test: watchdogd still runs
Change-Id: I1f7508fd55dce6e9ee72a6ab7a085011a76c0053
parent 081b710b

init/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -127,7 +127,6 @@ cc_library_static { 
        "ueventd.cpp",

        "ueventd.cpp",

        "ueventd_parser.cpp",

        "ueventd_parser.cpp",

        "util.cpp",

        "util.cpp",

        "watchdogd.cpp",

    ],

    ],

    whole_static_libs: ["libcap"],

    whole_static_libs: ["libcap"],

    header_libs: ["bootimg_headers"],

    header_libs: ["bootimg_headers"],
@@ -157,7 +156,6 @@ cc_binary { 
    srcs: ["main.cpp"],

    srcs: ["main.cpp"],

    symlinks: [

    symlinks: [

        "sbin/ueventd",

        "sbin/ueventd",

        "sbin/watchdogd",

    ],

    ],

}

}

*/

*/

init/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,6 @@ LOCAL_REQUIRED_MODULES := \ 
# Create symlinks.

# Create symlinks.

LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \

LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \

    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \

    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \

    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd





LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow

include $(BUILD_EXECUTABLE)
 
include $(BUILD_EXECUTABLE)

init/devices.cpp

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

#include "util.h"





#ifdef _INIT_INIT_H

#ifdef _INIT_INIT_H

#error "Do not include init.h in files used by ueventd or watchdogd; it will expose init's globals"

#error "Do not include init.h in files used by ueventd; it will expose init's globals"

#endif

#endif





using android::base::Basename;

using android::base::Basename;

init/host_init_stubs.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -41,10 +41,9 @@ uint32_t HandlePropertySet(const std::string&, const std::string&, const std::st 
}

}





// selinux.h

// selinux.h

bool SelinuxHasVendorInit() {

int SelinuxGetVendorAndroidVersion() {

    return true;

    return 10000;

}

}



void SelabelInitialize() {}

void SelabelInitialize() {}





bool SelabelLookupFileContext(const std::string& key, int type, std::string* result) {

bool SelabelLookupFileContext(const std::string& key, int type, std::string* result) {

init/host_init_stubs.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,9 @@ 




#include <string>

#include <string>





// android/api-level.h

#define __ANDROID_API_P__ 28



// sys/system_properties.h

// sys/system_properties.h

#define PROP_VALUE_MAX 92

#define PROP_VALUE_MAX 92
@@ -41,7 +44,7 @@ uint32_t HandlePropertySet(const std::string& name, const std::string& value, 
                           const std::string& source_context, const ucred& cr, std::string* error);

                           const std::string& source_context, const ucred& cr, std::string* error);





// selinux.h

// selinux.h

bool SelinuxHasVendorInit();

int SelinuxGetVendorAndroidVersion();

void SelabelInitialize();

void SelabelInitialize();

bool SelabelLookupFileContext(const std::string& key, int type, std::string* result);

bool SelabelLookupFileContext(const std::string& key, int type, std::string* result);