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

Commit 0609e8d2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "bpfmt."

parents cb1b68f9 dc699a26

base/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ 


cc_defaults {

    name: "libbase_defaults",

    cflags: ["-Wall", "-Werror", "-Wextra"],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

}



cc_library_headers {

debuggerd/Android.bp

+9 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ cc_defaults { 


cc_library_headers {

    name: "libdebuggerd_common_headers",

    export_include_dirs: ["common/include"]

    export_include_dirs: ["common/include"],

}



cc_library_shared {
@@ -39,7 +39,7 @@ cc_library_shared { 
    ],



    export_header_lib_headers: ["libdebuggerd_common_headers"],

    export_include_dirs: ["tombstoned/include"]

    export_include_dirs: ["tombstoned/include"],

}



// Utility library to tombstoned and get an output fd.
@@ -60,7 +60,7 @@ cc_library_static { 
    ],



    export_header_lib_headers: ["libdebuggerd_common_headers"],

    export_include_dirs: ["tombstoned/include"]

    export_include_dirs: ["tombstoned/include"],

}



// Core implementation, linked into libdebuggerd_handler and the dynamic linker.
@@ -186,7 +186,10 @@ cc_test { 
                "client/debuggerd_client_test.cpp",

                "debuggerd_test.cpp",

            ],

            static_libs: ["libasync_safe", "libtombstoned_client_static"],

            static_libs: [

                "libasync_safe",

                "libtombstoned_client_static",

            ],

        },

    },
@@ -197,7 +200,7 @@ cc_test { 
        "libdebuggerd_client",

        "liblog",

        "libminijail",

        "libnativehelper"

        "libnativehelper",

    ],



    static_libs: [
@@ -298,7 +301,7 @@ cc_binary { 
        "liblog",

    ],



    init_rc: ["tombstoned/tombstoned.rc"]

    init_rc: ["tombstoned/tombstoned.rc"],

}



subdirs = [

init/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ cc_defaults { 
        },

        uml: {

            cppflags: ["-DUSER_MODE_LINUX"],

        }

        },

    },

    static_libs: [

        "libbootloader_message",

init/test_service/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 
cc_binary {

    name: "test_service",

    srcs: ["test_service.cpp"],

    cflags: ["-Wall", "-Werror"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: ["libbase"],

    init_rc: ["test_service.rc"],

}

libappfuse/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ cc_library_shared { 
        "FuseBuffer.cc",

        "FuseBridgeLoop.cc",

        "EpollController.cc",

    ]

    ],

}



cc_test {
@@ -31,5 +31,5 @@ cc_test { 
        "tests/FuseAppLoopTest.cc",

        "tests/FuseBridgeLoopTest.cc",

        "tests/FuseBufferTest.cc",

    ]

    ],

}