summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--liblog/Android.bp2
-rw-r--r--liblog/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/liblog/Android.bp b/liblog/Android.bp
index ee394fda2..34e7f9283 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -47,7 +47,7 @@ cc_library {
47 sanitize: ["never"], 47 sanitize: ["never"],
48 }, 48 },
49 android_arm: { 49 android_arm: {
50 // TODO: This is to work around b/19059885. Remove after root cause is fixed 50 // TODO: This is to work around b/24465209. Remove after root cause is fixed
51 ldflags: ["-Wl,--hash-style=both"], 51 ldflags: ["-Wl,--hash-style=both"],
52 }, 52 },
53 windows: { 53 windows: {
diff --git a/liblog/Android.mk b/liblog/Android.mk
index 271c6f95b..a183db83e 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -69,7 +69,7 @@ LOCAL_MODULE := liblog
69LOCAL_WHOLE_STATIC_LIBRARIES := liblog 69LOCAL_WHOLE_STATIC_LIBRARIES := liblog
70LOCAL_CFLAGS := -Werror $(liblog_cflags) 70LOCAL_CFLAGS := -Werror $(liblog_cflags)
71 71
72# TODO: This is to work around b/19059885. Remove after root cause is fixed 72# TODO: This is to work around b/24465209. Remove after root cause is fixed
73LOCAL_LDFLAGS_arm := -Wl,--hash-style=both 73LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
74 74
75LOCAL_SANITIZE := never 75LOCAL_SANITIZE := never