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

Commit 0f185bb1 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "tombstoned: Add a shared library version of libtombstoned_client..."

parents a6bb369c 2d377cd6

debuggerd/Android.bp

+28 −7
Original line number Diff line number Diff line
@@ -11,12 +11,32 @@ cc_defaults { 
    local_include_dirs: ["include"],

}



cc_library_shared {

    name: "libtombstoned_client",

    defaults: ["debuggerd_defaults"],

    srcs: [

        "tombstoned/tombstoned_client.cpp",

        "util.cpp",

    ],



    static_libs: [

        "libasync_safe"

    ],



    shared_libs: [

        "libcutils",

        "libbase",

    ],



    export_include_dirs: ["tombstoned/include"]

}



// Utility library to tombstoned and get an output fd.

cc_library_static {

    name: "libtombstoned_client",

    name: "libtombstoned_client_static",

    defaults: ["debuggerd_defaults"],

    srcs: [

        "tombstoned_client.cpp",

        "tombstoned/tombstoned_client.cpp",

        "util.cpp",

    ],
@@ -25,6 +45,8 @@ cc_library_static { 
        "libcutils",

        "libbase",

    ],



    export_include_dirs: ["tombstoned/include"]

}



// Core implementation, linked into libdebuggerd_handler and the dynamic linker.
@@ -64,7 +86,7 @@ cc_library_static { 


    whole_static_libs: [

        "libdebuggerd_handler_core",

        "libtombstoned_client",

        "libtombstoned_client_static",

        "libasync_safe",

        "libbase",

        "libdebuggerd",
@@ -159,10 +181,8 @@ cc_test { 
            srcs: [

                "client/debuggerd_client_test.cpp",

                "debuggerd_test.cpp",

                "tombstoned_client.cpp",

                "util.cpp"

            ],

            static_libs: ["libasync_safe"],

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

        },

    },
@@ -171,6 +191,7 @@ cc_test { 
        "libbase",

        "libcutils",

        "libdebuggerd_client",

        "liblog"

    ],



    static_libs: [
@@ -211,7 +232,7 @@ cc_binary { 
    },



    static_libs: [

        "libtombstoned_client",

        "libtombstoned_client_static",

        "libdebuggerd",

        "libcutils",

    ],

debuggerd/client/debuggerd_client.cpp

+4 −3
Original line number Diff line number Diff line
@@ -31,9 +31,10 @@ 
#include <android-base/stringprintf.h>

#include <android-base/unique_fd.h>

#include <cutils/sockets.h>

#include <debuggerd/handler.h>

#include <debuggerd/protocol.h>

#include <debuggerd/util.h>



#include "debuggerd/handler.h"

#include "protocol.h"

#include "util.h"



using namespace std::chrono_literals;

debuggerd/client/debuggerd_client_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <android-base/strings.h>

#include <android-base/unique_fd.h>



#include <debuggerd/util.h>

#include "util.h"



using namespace std::chrono_literals;

using android::base::unique_fd;

debuggerd/crash_dump.cpp

+3 −3
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ 
#include "utility.h"



#include "debuggerd/handler.h"

#include "debuggerd/protocol.h"

#include "debuggerd/tombstoned.h"

#include "debuggerd/util.h"

#include "protocol.h"

#include "tombstoned/tombstoned.h"

#include "util.h"



using android::base::unique_fd;

using android::base::ReadFileToString;

debuggerd/debuggerd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
#include <android-base/parseint.h>

#include <android-base/unique_fd.h>

#include <debuggerd/client.h>

#include <debuggerd/util.h>

#include <selinux/selinux.h>

#include "util.h"



using android::base::unique_fd;