diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 14:46:57 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-18 16:38:20 -0700 |
| commit | b05f2ca150dddf2a2a5ef0ae683181e3b979ef2d (patch) | |
| tree | 1c782b300999fa1de6ac0f6d947840b54f68237d /tools | |
| parent | 88cfa0324724c7e90bfed3aaa61c27ca0926860b (diff) | |
| download | build-b05f2ca150dddf2a2a5ef0ae683181e3b979ef2d.zip build-b05f2ca150dddf2a2a5ef0ae683181e3b979ef2d.tar.gz build-b05f2ca150dddf2a2a5ef0ae683181e3b979ef2d.tar.bz2 | |
Move selection of C++ STL into the build system.
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).
The selection of the STL is as follows:
if LOCAL_CXX_STL == 'default'
ifdef LOCAL_SDK_VERSION
Use whatever STL the other NDK options have selected.
else
Use bionic's libstdc++ for target, GNU libstdc++ for host. This
is compatible with the existing build options.
endif
else
if LOCAL_CXX_STL == 'stlport'
Use stlport.
else if LOCAL_CXX_STL == 'libc++'
Use libc++.
else if LOCAL_CXX_STL == ''
Don't use any STL.
endif
endif
Bug: 15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/acp/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/acp/Android.mk b/tools/acp/Android.mk index 33c5567..e819e0c 100644 --- a/tools/acp/Android.mk +++ b/tools/acp/Android.mk @@ -21,5 +21,6 @@ LOCAL_STATIC_LIBRARIES := libhost LOCAL_C_INCLUDES := build/libs/host/include LOCAL_MODULE := acp LOCAL_ACP_UNAVAILABLE := true +LOCAL_CXX_STL := none include $(BUILD_HOST_EXECUTABLE) |