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

Commit 30bd51c6 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge changes If1cffa85,I9011a959 

* changes:
  init: move property_service.cpp to libinit
  init: statically link libselinux to init_tests
parents 5d89e6c7 2a978d32

init/Android.bp

+10 −5
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ cc_library_static { 
        "import_parser.cpp",

        "log.cpp",

        "parser.cpp",

        "property_service.cpp",

        "service.cpp",

        "tokenizer.cpp",

        "uevent_listener.cpp",
@@ -81,7 +82,12 @@ cc_library_static { 
        "libselinux",

        "liblog",

        "libprocessgroup",

        "libfs_mgr",

    ],

    include_dirs: [

        "system/core/mkbootimg",

    ],



}



/*
@@ -105,15 +111,11 @@ cc_binary { 
        "init.cpp",

        "init_first_stage.cpp",

        "keychords.cpp",

        "property_service.cpp",

        "reboot.cpp",

        "signal_handler.cpp",

        "ueventd.cpp",

        "watchdogd.cpp",

    ],

    include_dirs: [

        "system/core/mkbootimg"

    ],

    static_libs: [

        "libinit",

        "libbootloader_message",
@@ -162,9 +164,12 @@ cc_test { 
    shared_libs: [

        "libbase",

        "libcutils",

    ],

    static_libs: [

        "libinit",

        "libselinux",

        "libcrypto",

    ],

    static_libs: ["libinit"],

}



subdirs = ["*"]

init/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -51,15 +51,12 @@ LOCAL_SRC_FILES:= \ 
    init.cpp \

    init_first_stage.cpp \

    keychords.cpp \

    property_service.cpp \

    reboot.cpp \

    signal_handler.cpp \

    ueventd.cpp \

    watchdogd.cpp \



LOCAL_MODULE:= init

LOCAL_C_INCLUDES += \

    system/core/mkbootimg



LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)