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

Commit 53ae0cb4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Build init-debug.rc with Soong" into main am: 95403fce 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3048221



Change-Id: I8b5be00324c5382e8b58ebd170dcb5ce2c6412ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03bf52f9 95403fce

rootdir/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -107,3 +107,9 @@ prebuilt_etc { 
    src: "etc/hosts",

    filename: "hosts",

}



prebuilt_etc {

    name: "init-debug.rc",

    src: "init-debug.rc",

    sub_dir: "init",

}

rootdir/Android.mk

+0 −13
Original line number Diff line number Diff line
@@ -2,19 +2,6 @@ LOCAL_PATH:= $(call my-dir) 


$(eval $(call declare-1p-copy-files,system/core/rootdir,))



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

# init-debug.rc

include $(CLEAR_VARS)



LOCAL_MODULE := init-debug.rc

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init



include $(BUILD_PREBUILT)



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

# asan.options

ifneq ($(filter address,$(SANITIZE_TARGET)),)