generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply work around b/19059885 to x86

Browse Source 
Bug: http://b/19059885
Bug: http://b/21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
This commit is contained in:
Dmitriy Ivanov
2015-05-15 17:53:39 -07:00
parent ff407803db
commit 69a5fb951d
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@@ -1392,6 +1392,7 @@ LOCAL_LDFLAGS_64 := -Wl,--exclude-libs,libgcc.a
# TODO: This is to work around b/19059885. Remove after root cause is fixed
LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
$(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
$(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_dynamic_src_files))
@@ -1522,6 +1523,7 @@ LOCAL_CPPFLAGS := $(libc_common_cppflags)
# TODO: This is to work around b/19059885. Remove after root cause is fixed
LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
LOCAL_SRC_FILES := $(libstdcxx_common_src_files)
LOCAL_MODULE:= libstdc++