am 267422ac: am 5c136382: Merge "Fix libstdc++.so hash-style."

* commit '267422ac858ae8cb38c655e4ac7b5f755d02881f':
  Fix libstdc++.so hash-style.
This commit is contained in:
Dmitriy Ivanov 2015-03-27 23:43:39 +00:00 committed by Android Git Automerger
commit f57a0367f7

View File

@ -1502,7 +1502,7 @@ LOCAL_CFLAGS := $(libc_common_cflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_CPPFLAGS := $(libc_common_cppflags)
# TODO: This is to work around b/19059885. Remove after root cause is fixed # TODO: This is to work around b/19059885. Remove after root cause is fixed
LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv
LOCAL_SRC_FILES := $(libstdcxx_common_src_files) LOCAL_SRC_FILES := $(libstdcxx_common_src_files)
LOCAL_MODULE:= libstdc++ LOCAL_MODULE:= libstdc++