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

Commit e6132be5 authored by Steven Moreland's avatar Steven Moreland
Browse files

libutils/libcutils: make host more like device 

Having shared host libraries allows libraries depending on these to use
'shared_libs' for these. This simplifies configurations since these
libraries don't have to specify 'shared_libs' on all non-host targets.

Bug: 124524556
Test: build only

Change-Id: I09fb4a4fb66ea0a87cb76b1e6f400c537a11f082
parent e21d07fb

libcutils/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ cc_library { 
            ],

        },

        windows: {

            host_ldlibs: ["-lws2_32"],



            srcs: [

                "socket_inaddr_any_server_windows.cpp",

                "socket_network_client_windows.cpp",
@@ -92,9 +94,6 @@ cc_library { 
            ],



            enabled: true,

            shared: {

                enabled: false,

            },

            cflags: [

                "-D_GNU_SOURCE",

            ],

libutils/Android.bp

+9 −15
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ cc_defaults { 
    ],



    shared_libs: [

        "libcutils",

        "liblog",

    ],
@@ -83,7 +84,6 @@ cc_defaults { 
            cflags: ["-fvisibility=protected"],



            shared_libs: [

                "libcutils",

                "libprocessgroup",

                "libdl",

                "libvndksupport",
@@ -98,14 +98,6 @@ cc_defaults { 
            exclude_shared_libs: ["libvndksupport"],

        },



        host: {

            cflags: ["-DLIBUTILS_NATIVE=1"],



            shared: {

                enabled: false,

            },

        },



        linux_bionic: {

            enabled: true,

        },
@@ -180,18 +172,20 @@ cc_library { 
        },

    },



    target: {

        android: {

    shared_libs: [

         "libutils",

         "libbacktrace",

    ],

        },



    target: {

        linux: {

            srcs: [

                "ProcessCallStack.cpp",

            ],

        },

        windows: {

            enabled: false,

        },

    },

}