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

Commit c65973d5 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Automerger Merge Worker
Browse files

Merge "[statsd] Remove static variants of libstatssocket/pull" into main am: 743aab21

parents 1c27da59 743aab21
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ cc_defaults {
        "libprotobuf-cpp-lite",
        "libstatslog",
        "libutils",
        "libstatspull",
        "libstatssocket",
        "server_configurable_flags",
    ],
    static_libs: [
@@ -96,15 +98,11 @@ cc_defaults {
            shared_libs: [
                "libgui",
                "libinput",
                "libstatspull",
                "libstatssocket",
            ],
        },
        host: {
            static_libs: [
                "libinput",
                "libstatspull",
                "libstatssocket",
            ],
            include_dirs: [
                "bionic/libc/kernel/android/uapi/",
+2 −4
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ cc_defaults {
        "libprotobuf-cpp-lite",
        "libstatslog",
        "libutils",
        "libstatspull",
        "libstatssocket",
        "server_configurable_flags",
    ],
    static_libs: [
@@ -75,15 +77,11 @@ cc_defaults {
            shared_libs: [
                "libgui",
                "libinput",
                "libstatspull",
                "libstatssocket",
            ],
        },
        host: {
            static_libs: [
                "libinput",
                "libstatspull",
                "libstatssocket",
            ],
        },
    },
+1 −2
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ cc_defaults {
        "liblog",
        "libPlatformProperties",
        "libstatslog",
        "libstatspull",
        "libutils",
    ],
    static_libs: [
@@ -98,14 +99,12 @@ cc_defaults {
        android: {
            shared_libs: [
                "libinput",
                "libstatspull",
            ],
        },
        host: {
            static_libs: [
                "libinput",
                "libbinder",
                "libstatspull",
            ],
        },
    },