diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-06-11 13:18:41 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-07-07 14:18:20 -0700 |
| commit | d466780c7cedb41edcf13f28ad900556c6aaa5b2 (patch) | |
| tree | cbbc780df9598adb5788824075f2519c54f22fff /libstdc++/Android.mk | |
| parent | 519763265ec0b634bd9c264a0aca034882458ecc (diff) | |
| download | bionic-d466780c7cedb41edcf13f28ad900556c6aaa5b2.zip bionic-d466780c7cedb41edcf13f28ad900556c6aaa5b2.tar.gz bionic-d466780c7cedb41edcf13f28ad900556c6aaa5b2.tar.bz2 | |
Add missing SMP barriers to libstdc++
Change-Id: I20a8dcd2e3316ac60237e800c682cacc8e59e187
Diffstat (limited to 'libstdc++/Android.mk')
| -rw-r--r-- | libstdc++/Android.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libstdc++/Android.mk b/libstdc++/Android.mk index df97c9f..8bc181f 100644 --- a/libstdc++/Android.mk +++ b/libstdc++/Android.mk @@ -1,4 +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:= \ @@ -9,6 +20,8 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE:= libstdc++ +LOCAL_CFLAGS := $(libstdc++_cflags) + LOCAL_SYSTEM_SHARED_LIBRARIES := libc include $(BUILD_SHARED_LIBRARY) @@ -21,6 +34,8 @@ LOCAL_SRC_FILES:= \ src/pure_virtual.cpp \ src/typeinfo.cpp +LOCAL_CFLAGS := $(libstdc++_cflags) + LOCAL_MODULE:= libstdc++ LOCAL_SYSTEM_SHARED_LIBRARIES := libc |