diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 15:43:43 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-26 17:20:44 -0700 |
| commit | b82dd133946a06baa55832c389c0fdfadc0261bc (patch) | |
| tree | 528a4555ae24b996b1520ba83561c4a6a9366408 /Android.mk | |
| parent | c4ecec13b6921b9d3b4edec8cc02fd96a9c2e53b (diff) | |
| download | external_libcxx-b82dd133946a06baa55832c389c0fdfadc0261bc.tar.gz external_libcxx-b82dd133946a06baa55832c389c0fdfadc0261bc.tar.bz2 external_libcxx-b82dd133946a06baa55832c389c0fdfadc0261bc.zip | |
Explictly name static libraries.
The build system's LOCAL_CXX_STL relies on a difference in name
(libc++_static) to decide whether to use the static or dynamic STL.
Change-Id: I59545435770d11579d04fb0ff6f101f0ec1ea23c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 87c0aa311..b6db3ab50 100644 --- a/Android.mk +++ b/Android.mk @@ -58,7 +58,7 @@ LIBCXX_CPPFLAGS := \ # target static lib include $(CLEAR_VARS) -LOCAL_MODULE := libc++ +LOCAL_MODULE := libc++_static LOCAL_CLANG := true LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) @@ -73,7 +73,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libc++ LOCAL_CLANG := true -LOCAL_WHOLE_STATIC_LIBRARIES := libc++ +LOCAL_WHOLE_STATIC_LIBRARIES := libc++_static LOCAL_SHARED_LIBRARIES := libdl LOCAL_CXX_STL := none @@ -86,7 +86,7 @@ include $(BUILD_SHARED_LIBRARY) # host static lib include $(CLEAR_VARS) -LOCAL_MODULE := libc++ +LOCAL_MODULE := libc++_static LOCAL_CLANG := true LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) @@ -109,7 +109,7 @@ LOCAL_MODULE := libc++ LOCAL_CLANG := true LOCAL_LDFLAGS := -nodefaultlibs LOCAL_LDLIBS := -lc -LOCAL_WHOLE_STATIC_LIBRARIES := libc++ +LOCAL_WHOLE_STATIC_LIBRARIES := libc++_static LOCAL_MULTILIB := both LOCAL_CXX_STL := none |