[PATCH v6 2/6] android: cmake: fix include/library path

Imre Deak imre.deak at intel.com
Thu Sep 20 02:33:13 PDT 2012


Needed by the Android NDK r8b version.

Signed-off-by: Imre Deak <imre.deak at intel.com>
---
 cmake/toolchain/android.toolchain.cmake |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/toolchain/android.toolchain.cmake b/cmake/toolchain/android.toolchain.cmake
index 9a0b07d..faffe6c 100644
--- a/cmake/toolchain/android.toolchain.cmake
+++ b/cmake/toolchain/android.toolchain.cmake
@@ -671,6 +671,8 @@ if( BUILD_WITH_ANDROID_NDK )
  else()
   set( __stlIncludePath "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/include" )
   set( __stlLibPath "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}" )
+  set( __stlIncludePath "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/include" )
+  set( __stlLibPath "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}" )
  endif()
 endif()
 
-- 
1.7.9.5



More information about the apitrace mailing list