am 6cdab387: Merge "Restore <nsswitch.h> which is BSD API, not private."

[android-sdk/platform-bionic.git] / libstdc++ / Android.mk

diff --git a/libstdc++/Android.mk b/libstdc++/Android.mk
index 8bc181f559029236e801d4cdc7711a1c4e4b7c78..ff9609aca9ec5ccda38972b566c15c638a2d606e 100644 (file)
--- a/libstdc++/Android.mk
+++ b/libstdc++/Android.mk
@@ -1,43 +1,15 @@
 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/private
-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_CFLAGS := $(libstdc++_cflags)
-
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 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)