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

Commit 15345935 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tweak linux_glibc properties for musl builds in... 

Merge "Tweak linux_glibc properties for musl builds in packages/modules/Bluetooth" am: 67729e22 am: 9fabf130

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2042989



Change-Id: Id4076429dbdede9c16e09085a03508be1d4d28f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b65fe697 9fabf130

system/btcore/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ cc_defaults { 
        "com.android.bluetooth",

    ],

    target: {

        linux_glibc: {

        host_linux: {

            cflags: ["-D_GNU_SOURCE"],

        },

    },

system/gd/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -783,6 +783,18 @@ cc_defaults { 
            // Export Python native symbols such as PyType_Type

            // suffix: ".cpython-38android-x86_64-linux-gnu",

        },

        linux_musl_x86: {

            enabled: false,

        },

        linux_musl_x86_64: {

            include_dirs: ["external/python/cpython3/android/linux_x86_64/pyconfig"],

            cflags: ["-DSOABI=\"cpython-38android-x86_64-linux-gnu\""],

            // Commenting out the Linux suffix so that cpython-38-x86_64-linux-gnu

            // Python 3.8 can also import the untagged .so library per PEP 3149

            // Keep this change until Android py3-cmd can run ACTS, gRPC and can

            // Export Python native symbols such as PyType_Type

            // suffix: ".cpython-38android-x86_64-linux-gnu",

        },

        windows: {

            enabled: false,

        },

system/osi/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ cc_library_static { 
    // should be compatible for a Linux host OS. We should figure out what to do for

    // a non-Linux host OS.

    target: {

        linux_glibc: {

        host_linux: {

            cflags: [

                "-D_GNU_SOURCE",

                "-DOS_GENERIC",
@@ -145,7 +145,7 @@ cc_test { 
        "libc++fs",

    ],

    target: {

        linux_glibc: {

        host_linux: {

            cflags: ["-DOS_GENERIC"],

        },

    },

system/service/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ cc_test { 
                "test/stub_ipc_handler_binder.cc",

            ],

        },

        linux_glibc: {

        host_linux: {

            srcs: btserviceLinuxSrc + [

                // TODO(bcf): Fix this test.

                //"test/ipc_linux_unittest.cc",