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

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

Merge "Move init and ueventd scripts from / to /system/etc" 

am: 47cdf6c0

Change-Id: Ia46f5dcd439dec4f28c5418195edfb32a92f7ad2
parents 2b879c26 47cdf6c0

init/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -185,9 +185,11 @@ cc_binary { 
    static_libs: ["libinit"],

    required: [

        "e2fsdroid",

        "init.rc",

        "mke2fs",

        "sload_f2fs",

        "make_f2fs",

        "ueventd.rc",

    ],

    srcs: ["main.cpp"],

    symlinks: ["ueventd"],

init/init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void LoadBootScripts(ActionManager& action_manager, ServiceList& service_ 


    std::string bootscript = GetProperty("ro.boot.init_rc", "");

    if (bootscript.empty()) {

        parser.ParseConfig("/init.rc");

        parser.ParseConfig("/system/etc/init/hw/init.rc");

        if (!parser.ParseConfig("/system/etc/init")) {

            late_import_paths.emplace_back("/system/etc/init");

        }

init/ueventd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int ueventd_main(int argc, char** argv) { 
    // TODO: cleanup platform ueventd.rc to remove vendor specific device node entries (b/34968103)

    auto hardware = android::base::GetProperty("ro.hardware", "");



    auto ueventd_configuration = ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc",

    auto ueventd_configuration = ParseConfig({"/system/etc/ueventd.rc", "/vendor/ueventd.rc",

                                              "/odm/ueventd.rc", "/ueventd." + hardware + ".rc"});



    uevent_handlers.emplace_back(std::make_unique<DeviceHandler>(

rootdir/Android.bp

0 → 100644
+26 −0
Original line number Diff line number Diff line 
// Copyright 2019 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



prebuilt_etc {

    name: "init.rc",

    src: "init.rc",

    sub_dir: "init/hw",

    required: ["fsverity_init"],

}



prebuilt_etc {

    name: "ueventd.rc",

    src: "ueventd.rc",

    recovery_available: true,

}

rootdir/Android.mk

+4 −16
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



#######################################

# init.rc

include $(CLEAR_VARS)



LOCAL_MODULE := init.rc

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

LOCAL_REQUIRED_MODULES := fsverity_init



# The init symlink must be a post install command of a file that is to TARGET_ROOT_OUT.

# Since init.rc is required for init and satisfies that requirement, we hijack it to create the symlink.

LOCAL_POST_INSTALL_CMD := ln -sf /system/bin/init $(TARGET_ROOT_OUT)/init



include $(BUILD_PREBUILT)



#######################################

# init-debug.rc

include $(CLEAR_VARS)
@@ -148,6 +132,10 @@ ifeq ($(AB_OTA_UPDATER),true) 
  LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/postinstall

endif



# The init symlink must be a post install command of a file that is to TARGET_ROOT_OUT.

# Since init.environ.rc is required for init and satisfies that requirement, we hijack it to create the symlink.

LOCAL_POST_INSTALL_CMD += ; ln -sf /system/bin/init $(TARGET_ROOT_OUT)/init



include $(BUILD_SYSTEM)/base_rules.mk



$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in