diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-23 21:50:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-23 21:50:15 +0000 |
| commit | e3ecedd306ec16ecb31c6b7d6f9fdcb65c03b70f (patch) | |
| tree | 7857fbd884df8bb1edb0abf37b1dad04a9cce08c /libc | |
| parent | 3da9373fe0ada19d13c6c3f9831dee93ec0ba7a6 (diff) | |
| parent | 7280e507b61851bce9b18259368d65b9e950c330 (diff) | |
| download | bionic-e3ecedd306ec16ecb31c6b7d6f9fdcb65c03b70f.zip bionic-e3ecedd306ec16ecb31c6b7d6f9fdcb65c03b70f.tar.gz bionic-e3ecedd306ec16ecb31c6b7d6f9fdcb65c03b70f.tar.bz2 | |
Merge "Remove jemalloc.a from libc_nomalloc.a"
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 5c1a1a5..7a8c344 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1222,10 +1222,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_WHOLE_STATIC_LIBRARIES_arm := libc_aeabi -ifneq ($(MALLOC_IMPL),dlmalloc) -LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc -endif - LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := @@ -1318,6 +1314,11 @@ LOCAL_MODULE := libc LOCAL_CLANG := $(use_clang) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_WHOLE_STATIC_LIBRARIES := libc_common + +ifneq ($(MALLOC_IMPL),dlmalloc) +LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc +endif + LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_ADDRESS_SANITIZER := false @@ -1365,6 +1366,11 @@ LOCAL_STRIP_MODULE := keep_symbols LOCAL_SHARED_LIBRARIES := libdl LOCAL_WHOLE_STATIC_LIBRARIES := libc_common + +ifneq ($(MALLOC_IMPL),dlmalloc) +LOCAL_WHOLE_STATIC_LIBRARIES += libjemalloc +endif + LOCAL_CXX_STL := none LOCAL_SYSTEM_SHARED_LIBRARIES := |