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

Commit 2a978d32 authored by Tom Cherry's avatar Tom Cherry
Browse files

init: move property_service.cpp to libinit 

service.cpp, which is part of libinit, references symbols in
property_service.cpp, which causes the linker to complain when linking
libinit.a in some situations.

Therefore, we move property_service.cpp to libinit.

Separately, this will make it easier to write tests for
property_service.cpp, which we will want to do in the future.

Test: build, init unit tests
Change-Id: If1cffa8510b97e9436efed3c8ea0724272383eba
parent 45a9d67c

init/Android.bp

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

        "import_parser.cpp",

        "log.cpp",

        "log.cpp",

        "parser.cpp",

        "parser.cpp",

        "property_service.cpp",

        "service.cpp",

        "service.cpp",

        "tokenizer.cpp",

        "tokenizer.cpp",

        "uevent_listener.cpp",

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

        "libselinux",

        "liblog",

        "liblog",

        "libprocessgroup",

        "libprocessgroup",

        "libfs_mgr",

    ],

    include_dirs: [

        "system/core/mkbootimg",

    ],

    ],



}

}





/*

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

        "init.cpp",

        "init_first_stage.cpp",

        "init_first_stage.cpp",

        "keychords.cpp",

        "keychords.cpp",

        "property_service.cpp",

        "reboot.cpp",

        "reboot.cpp",

        "signal_handler.cpp",

        "signal_handler.cpp",

        "ueventd.cpp",

        "ueventd.cpp",

        "watchdogd.cpp",

        "watchdogd.cpp",

    ],

    ],

    include_dirs: [

        "system/core/mkbootimg"

    ],

    static_libs: [

    static_libs: [

        "libinit",

        "libinit",

        "libbootloader_message",

        "libbootloader_message",

init/Android.mk

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

    init.cpp \

    init_first_stage.cpp \

    init_first_stage.cpp \

    keychords.cpp \

    keychords.cpp \

    property_service.cpp \

    reboot.cpp \

    reboot.cpp \

    signal_handler.cpp \

    signal_handler.cpp \

    ueventd.cpp \

    ueventd.cpp \

    watchdogd.cpp \

    watchdogd.cpp \





LOCAL_MODULE:= init

LOCAL_MODULE:= init

LOCAL_C_INCLUDES += \

    system/core/mkbootimg





LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)