commit a3c76c2824c4ce1f097a4c1ae601c0fba8142bc9
author Colin Cross <ccross@android.com> Tue Mar 25 17:54:56 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 25 17:54:56 2014 +0000
tree 3e349a3863966bdf697539196068e08bb9f5803a
parent fa97fe67d32860e498acd59eabb7dbc71ca2ff31
parent 966c9194a66211d7e198f2d319c9004c6dbae410

Merge "remove libeffects from 64-bit blacklist"

core/binary.mk

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 @@
     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