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

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

Merge "Tweak linux_glibc properties for musl builds in system/core" am: ec8519e9 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2044103



Change-Id: I495181e0811a02adbd89decd306a83be31ebf74d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d9c7b73 ec8519e9

libdiskconfig/Android.bp

+1 −5
Original line number Original line Diff line number Diff line
@@ -27,12 +27,8 @@ cc_library { 
        darwin: {

        darwin: {

            enabled: false,

            enabled: false,

        },

        },

        linux_glibc: {

        host_linux: {

            cflags: [

            cflags: [

                "-O2",

                "-g",

                "-W",

                "-Wall",

                "-D_LARGEFILE64_SOURCE",

                "-D_LARGEFILE64_SOURCE",

            ],

            ],

        },

        },

libutils/Android.bp

+1 −3
Original line number Original line Diff line number Diff line
@@ -48,13 +48,11 @@ cc_library_headers { 
            header_libs: ["libbacktrace_headers"],

            header_libs: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

        },

        },

        linux_glibc: {

        host_linux: {

            header_libs: ["libbacktrace_headers"],

            header_libs: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

        },

        },

        linux_bionic: {

        linux_bionic: {

            header_libs: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

            enabled: true,

            enabled: true,

        },

        },

        windows: {

        windows: {