diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-01 15:19:05 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-04-01 16:35:08 -0700 |
| commit | 8d0c51fdca1a571448c1eca58cbed4a520b2d1e2 (patch) | |
| tree | 88d47ad50da5247bcb84fe3fdd8b8a06f793e185 | |
| parent | 2cfc479c0b2d2872bfc7b1257aa79452ae6331ff (diff) | |
| download | external_libcxx-8d0c51fdca1a571448c1eca58cbed4a520b2d1e2.tar.gz external_libcxx-8d0c51fdca1a571448c1eca58cbed4a520b2d1e2.tar.bz2 external_libcxx-8d0c51fdca1a571448c1eca58cbed4a520b2d1e2.zip | |
Drop compiler-rt from WHOLE_STATIC_LIBRARIES.android-wear-5.1.1_r1android-wear-5.1.0_r1
The build system handles the reasons we used to do this now, and doing
this commonly causes multiple symbol definition problems when it
collides with libgcc.
Bug: 18389856
Change-Id: Ife74d66c2327751ca47630216bea9a08b8270c89
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 26bcf6be2..ad1f871b5 100644 --- a/Android.mk +++ b/Android.mk @@ -61,7 +61,7 @@ LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) LOCAL_RTTI_FLAG := -frtti -LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi libcompiler_rt +LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi LOCAL_CXX_STL := none include $(BUILD_STATIC_LIBRARY) @@ -91,11 +91,6 @@ LOCAL_RTTI_FLAG := -frtti LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi LOCAL_MULTILIB := both LOCAL_CXX_STL := none - -ifneq ($(HOST_OS), darwin) -LOCAL_WHOLE_STATIC_LIBRARIES += libcompiler_rt -endif - include $(BUILD_HOST_STATIC_LIBRARY) # Don't build for unbundled branches |