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

Use the build system's STL selection.

Browse Source 
This file is only kept around for compatibility so the change won't have
to go in as one mega-CL.

Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
This commit is contained in:
Dan Albert
2014-09-15 12:54:16 -07:00
parent 3744ab214c
commit c4ecec13b6
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@@ -65,6 +65,7 @@ LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES)
LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS)
LOCAL_RTTI_FLAG := -frtti LOCAL_RTTI_FLAG := -frtti
LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi libcompiler_rt LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi libcompiler_rt
LOCAL_CXX_STL := none
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@@ -74,7 +75,7 @@ LOCAL_MODULE := libc++
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_WHOLE_STATIC_LIBRARIES := libc++ LOCAL_WHOLE_STATIC_LIBRARIES := libc++
LOCAL_SHARED_LIBRARIES := libdl LOCAL_SHARED_LIBRARIES := libdl
LOCAL_SYSTEM_SHARED_LIBRARIES := libc libm LOCAL_CXX_STL := none
ifneq ($(TARGET_ARCH),arm) ifneq ($(TARGET_ARCH),arm)
LOCAL_SHARED_LIBRARIES += libdl LOCAL_SHARED_LIBRARIES += libdl
@@ -93,6 +94,7 @@ LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS)
LOCAL_RTTI_FLAG := -frtti LOCAL_RTTI_FLAG := -frtti
LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_CXX_STL := none
ifneq ($(HOST_OS), darwin) ifneq ($(HOST_OS), darwin)
LOCAL_WHOLE_STATIC_LIBRARIES += libcompiler_rt LOCAL_WHOLE_STATIC_LIBRARIES += libcompiler_rt
@@ -109,6 +111,7 @@ LOCAL_LDFLAGS := -nodefaultlibs
LOCAL_LDLIBS := -lc LOCAL_LDLIBS := -lc
LOCAL_WHOLE_STATIC_LIBRARIES := libc++ LOCAL_WHOLE_STATIC_LIBRARIES := libc++
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
LOCAL_CXX_STL := none
ifeq ($(HOST_OS), darwin) ifeq ($(HOST_OS), darwin)
LOCAL_LDFLAGS += \ LOCAL_LDFLAGS += \

14
libcxx.mk
View File

@@ -14,14 +14,6 @@
# limitations under the License. # limitations under the License.
# #
# To use libc++, "include external/libcxx/libcxx.mk" in your target. # New projects shouldn't use this file. To use libc++, add the following line to
# your makefile.
LOCAL_C_INCLUDES := \ LOCAL_CXX_STL := libc++
external/libcxx/include \
$(LOCAL_C_INCLUDES) \
LOCAL_CFLAGS += -D_USING_LIBCXX
LOCAL_CPPFLAGS += -nostdinc++
LOCAL_LDFLAGS += -nodefaultlibs
LOCAL_LDLIBS += -lm -lc
LOCAL_SHARED_LIBRARIES += libc++