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

Commit 5d280a58 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Android Git Automerger
Browse files

am 8bed8749: Merge "Fix bug number for linker related workarounds" 

* commit '8bed8749':
  Fix bug number for linker related workarounds
parents 850cf464 8bed8749

liblog/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ cc_library { 
            sanitize: ["never"],

            sanitize: ["never"],

        },

        },

        android_arm: {

        android_arm: {

            // TODO: This is to work around b/19059885. Remove after root cause is fixed

            // TODO: This is to work around b/24465209. Remove after root cause is fixed

            ldflags: ["-Wl,--hash-style=both"],

            ldflags: ["-Wl,--hash-style=both"],

        },

        },

        windows: {

        windows: {

liblog/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ LOCAL_MODULE := liblog 
LOCAL_WHOLE_STATIC_LIBRARIES := liblog

LOCAL_WHOLE_STATIC_LIBRARIES := liblog

LOCAL_CFLAGS := -Werror $(liblog_cflags)

LOCAL_CFLAGS := -Werror $(liblog_cflags)





# TODO: This is to work around b/19059885. Remove after root cause is fixed

# TODO: This is to work around b/24465209. Remove after root cause is fixed

LOCAL_LDFLAGS_arm := -Wl,--hash-style=both

LOCAL_LDFLAGS_arm := -Wl,--hash-style=both





LOCAL_SANITIZE := never

LOCAL_SANITIZE := never