diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-03-25 02:43:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-25 02:43:57 +0000 |
| commit | fa97fe67d32860e498acd59eabb7dbc71ca2ff31 (patch) | |
| tree | e54210b4778fef347afefb8ec1e4d0f4f0b272b0 | |
| parent | 8c60a1df4379bcc2fef020878aef8d78233f906d (diff) | |
| parent | 92d50c1a10764f83de96bb01c92927460268bf50 (diff) | |
| download | replicant_build-fa97fe67d32860e498acd59eabb7dbc71ca2ff31.zip replicant_build-fa97fe67d32860e498acd59eabb7dbc71ca2ff31.tar.gz replicant_build-fa97fe67d32860e498acd59eabb7dbc71ca2ff31.tar.bz2 | |
Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
| -rw-r--r-- | core/binary.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/binary.mk b/core/binary.mk index 81dd5bf..5011129 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -60,9 +60,9 @@ ifdef LOCAL_SDK_VERSION my_ndk_stl_cppflags := -std=c++11 else # LOCAL_NDK_STL_VARIANT is gnustl_static - my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/include \ - $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/include - my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libgnustl_static.a + my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GCC_VERSION)/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/include \ + $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GCC_VERSION)/include + my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GCC_VERSION)/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libgnustl_static.a endif endif endif |