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

Commit f9734170 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Use target.linux for all linux kernel based targets" 

am: ab62265f

Change-Id: I11e4bd0dae56c350a9839f95b1e85bf30490701d
parents 57638bf9 ab62265f

base/Android.bp

+6 −17
Original line number Diff line number Diff line
@@ -64,37 +64,29 @@ cc_library { 
    target: {

        android: {

            srcs: [

                "errors_unix.cpp",

                "properties.cpp",

                "chrono_utils.cpp",

            ],

            cppflags: ["-Wexit-time-destructors"],

            sanitize: {

                misc_undefined: ["integer"],

            },



        },

        darwin: {

        linux: {

            srcs: [

                "chrono_utils.cpp",

                "errors_unix.cpp",

            ],

            cppflags: ["-Wexit-time-destructors"],

        },

        linux_bionic: {

        darwin: {

            srcs: [

                "chrono_utils.cpp",

                "errors_unix.cpp",

            ],

            cppflags: ["-Wexit-time-destructors"],

            enabled: true,

        },

        linux_glibc: {

            srcs: [

                "chrono_utils.cpp",

                "errors_unix.cpp",

            ],

            cppflags: ["-Wexit-time-destructors"],

        linux_bionic: {

            enabled: true,

        },

        windows: {

            srcs: [
@@ -127,15 +119,12 @@ cc_test { 
    ],

    target: {

        android: {

            srcs: [

                "chrono_utils_test.cpp",

                "properties_test.cpp"

            ],

            srcs: ["properties_test.cpp"],

            sanitize: {

                misc_undefined: ["integer"],

            },

        },

        linux_glibc: {

        linux: {

            srcs: ["chrono_utils_test.cpp"],

        },

        windows: {

libbacktrace/Android.bp

+3 −31
Original line number Diff line number Diff line
@@ -83,20 +83,7 @@ cc_library { 
        darwin: {

            enabled: true,

        },

        linux_glibc: {

            srcs: libbacktrace_sources,



            shared_libs: [

                "libbase",

                "liblog",

                "libunwind",

                "libunwindstack",

            ],



            static_libs: ["libcutils"],

        },

        linux_bionic: {

            enabled: true,

        linux: {

            srcs: libbacktrace_sources,



            shared_libs: [
@@ -109,16 +96,7 @@ cc_library { 
            static_libs: ["libcutils"],

        },

        android: {

            srcs: libbacktrace_sources,



            shared_libs: [

                "libbase",

                "liblog",

                "libunwind",

                "libunwindstack",

            ],



            static_libs: ["libasync_safe", "libcutils"],

            static_libs: ["libasync_safe"],

        },

    },

    whole_static_libs: ["libdemangle"],
@@ -135,13 +113,7 @@ cc_library_shared { 
    srcs: ["backtrace_testlib.cpp"],



    target: {

        linux_glibc: {

            shared_libs: [

                "libunwind",

                "libunwindstack",

            ],

        },

        android: {

        linux: {

            shared_libs: [

                "libunwind",

                "libunwindstack",

libutils/Android.bp

+6 −12
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ cc_library { 
    target: {

        android: {

            srcs: [

                "Looper.cpp",

                "ProcessCallStack.cpp",

                "Trace.cpp",

            ],
@@ -115,6 +113,12 @@ cc_library { 
                misc_undefined: ["integer"],

            },

        },

        linux: {

            srcs: [

                "Looper.cpp",

                "ProcessCallStack.cpp",

            ],

        },



        host: {

            cflags: ["-DLIBUTILS_NATIVE=1"],
@@ -124,18 +128,8 @@ cc_library { 
            },

        },



        linux_glibc: {

            srcs: [

                "Looper.cpp",

                "ProcessCallStack.cpp",

            ],

        },

        linux_bionic: {

            enabled: true,

            srcs: [

                "Looper.cpp",

                "ProcessCallStack.cpp",

            ],

        },



        darwin: {

libutils/tests/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ cc_test { 
    target: {

        android: {

            srcs: [

                "Looper_test.cpp",

                "RefBase_test.cpp",

                "SystemClock_test.cpp",

            ],

            shared_libs: [
@@ -46,7 +44,7 @@ cc_test { 
                "libbase",

            ],

        },

        linux_glibc: {

        linux: {

            srcs: [

                "Looper_test.cpp",

                "RefBase_test.cpp",