| commit | 203082b8217cd853eee510ad371b382701960610 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Mar 27 22:55:20 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 27 22:55:20 2015 +0000 |
| tree | 5042f453214b2d176c601710c87350c30c7f3944 | |
| parent | 5c136382a6f1ad796a60463898d4c08fadead669 [diff] | |
| parent | e001ca3e18b085661868be9a77bd18bea587780c [diff] |
Merge "linker_environ: clear MALLOC_CONF when AT_SECURE=1"
diff --git a/libc/Android.mk b/libc/Android.mk index ebc59de..e438552 100644 --- a/libc/Android.mk +++ b/libc/Android.mk
@@ -1502,7 +1502,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_arm := -Wl,--hash-style=sysv LOCAL_SRC_FILES := $(libstdcxx_common_src_files) LOCAL_MODULE:= libstdc++