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

am e842dc0d: am c16c8368: Merge "Generate gnu hash for arm only"

Browse Source 
* commit 'e842dc0de5ce5f9950e323ae8805909f60867bf6':
  Generate gnu hash for arm only
This commit is contained in:
Dimitry Ivanov
2015-03-10 17:48:29 +00:00
committed by Android Git Automerger
parent 6d0735fa2b e842dc0de5
commit 1f2b704ccf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libc/Android.mk
View File

@@ -1326,7 +1326,7 @@ LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
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 := -Wl,--hash-style=both LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@@ -1480,7 +1480,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 := -Wl,--hash-style=both LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_SRC_FILES := $(libstdcxx_common_src_files) LOCAL_SRC_FILES := $(libstdcxx_common_src_files)
LOCAL_MODULE:= libstdc++ LOCAL_MODULE:= libstdc++

2
libm/Android.mk
View File

@@ -439,7 +439,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
# 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 := -Wl,--hash-style=both LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_MODULE := libm LOCAL_MODULE := libm
LOCAL_CLANG := $(libm_clang) LOCAL_CLANG := $(libm_clang)