LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explictly name static libraries.

Browse Source 
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
This commit is contained in:
Dan Albert
2014-09-26 15:43:43 -07:00
parent c4ecec13b6
commit b82dd13394
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Android.mk
View File

@@ -58,7 +58,7 @@ LIBCXX_CPPFLAGS := \
# target static lib # target static lib
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libc++ LOCAL_MODULE := libc++_static
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES)
LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES)
@@ -73,7 +73,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libc++ LOCAL_MODULE := libc++
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_WHOLE_STATIC_LIBRARIES := libc++ LOCAL_WHOLE_STATIC_LIBRARIES := libc++_static
LOCAL_SHARED_LIBRARIES := libdl LOCAL_SHARED_LIBRARIES := libdl
LOCAL_CXX_STL := none LOCAL_CXX_STL := none
@@ -86,7 +86,7 @@ include $(BUILD_SHARED_LIBRARY)
# host static lib # host static lib
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libc++ LOCAL_MODULE := libc++_static
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES)
LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES)
@@ -109,7 +109,7 @@ LOCAL_MODULE := libc++
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_LDFLAGS := -nodefaultlibs LOCAL_LDFLAGS := -nodefaultlibs
LOCAL_LDLIBS := -lc LOCAL_LDLIBS := -lc
LOCAL_WHOLE_STATIC_LIBRARIES := libc++ LOCAL_WHOLE_STATIC_LIBRARIES := libc++_static
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_CXX_STL := none LOCAL_CXX_STL := none