diff --git a/libstdc++/Android.mk b/libstdc++/Android.mk
index 41e6c4d8ade46762d8069e9f66a82b59358bbbc8..ff9609aca9ec5ccda38972b566c15c638a2d606e 100644 (file)
--- a/libstdc++/Android.mk
+++ b/libstdc++/Android.mk
LOCAL_PATH:= $(call my-dir)
-# Common C++ flags to build this library.
-# Note that we need to access private Bionic headers
-# and define ANDROID_SMP accordingly.
-libstdc++_cflags := -Ibionic/libc/
-ifeq ($(TARGET_CPU_SMP),true)
- libstdc++_cflags += -DANDROID_SMP=1
-else
- libstdc++_cflags += -DANDROID_SMP=0
-endif
-
include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- src/one_time_construction.cpp \
- src/new.cpp \
- src/pure_virtual.cpp \
- src/typeinfo.cpp
-
+LOCAL_SRC_FILES := src/libstdc++.cpp
LOCAL_MODULE:= libstdc++
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_CFLAGS := $(libstdc++_cflags)
-
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
-
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- src/one_time_construction.cpp \
- src/new.cpp \
- src/pure_virtual.cpp \
- src/typeinfo.cpp
-
-LOCAL_CFLAGS := $(libstdc++_cflags)
-
+LOCAL_SRC_FILES:= src/libstdc++.cpp
LOCAL_MODULE:= libstdc++
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
-
include $(BUILD_STATIC_LIBRARY)