diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-27 17:32:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-27 17:32:03 +0000 |
| commit | f367bfa741880a19b70d3ecf60c23d35b922b0e4 (patch) | |
| tree | ff9dbd3108f1810f3aa288eb52ca2ba66f135463 | |
| parent | 06a3341310f113dd5c1e425e1eaba312d2151ed3 (diff) | |
| parent | 32ec1ea2be124ea5cb3b92faf60d00787ce91d97 (diff) | |
| download | external_libcxx-f367bfa741880a19b70d3ecf60c23d35b922b0e4.tar.gz external_libcxx-f367bfa741880a19b70d3ecf60c23d35b922b0e4.tar.bz2 external_libcxx-f367bfa741880a19b70d3ecf60c23d35b922b0e4.zip | |
am 32ec1ea2: Adds compiler-rt to target builds
* commit '32ec1ea2be124ea5cb3b92faf60d00787ce91d97':
Adds compiler-rt to target builds
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index b803bdc14..eb16d909c 100644 --- a/Android.mk +++ b/Android.mk @@ -64,7 +64,7 @@ LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) external/libcxxrt/include LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) -DLIBCXXRT LOCAL_RTTI_FLAG := -frtti -LOCAL_WHOLE_STATIC_LIBRARIES := libcxxrt +LOCAL_WHOLE_STATIC_LIBRARIES := libcxxrt libcompiler_rt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) @@ -74,7 +74,7 @@ LOCAL_MODULE := libc++ LOCAL_CLANG := true LOCAL_WHOLE_STATIC_LIBRARIES := libc++ LOCAL_SHARED_LIBRARIES := libdl -LOCAL_SYSTEM_SHARED_LIBRARIES := libc +LOCAL_SYSTEM_SHARED_LIBRARIES := libc libm # Bug: 14296739 # The MIPS target in LLVM is spuriously generating a text relocation for |