From 3771bc13051b55e084bc08d97594f4a741784318 Mon Sep 17 00:00:00 2001 From: Deadpikle Date: Fri, 8 Sep 2017 21:28:24 -0400 Subject: [PATCH] Check for old vs new LLVM include dir (#492) --- setenv-android.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/setenv-android.sh b/setenv-android.sh index 31482b09..fd59cdac 100755 --- a/setenv-android.sh +++ b/setenv-android.sh @@ -287,6 +287,12 @@ else THE_STL=$(tr [A-Z] [a-z] <<< "$2") fi +# LLVM include directory may be different depending on NDK version. Default to new location (latest NDK checked: r16beta1). +LLVM_INCLUDE_DIR="$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/include" +if [ ! -d "$LLVM_INCLUDE_DIR" ]; then + LLVM_INCLUDE_DIR="$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/libcxx/include" +fi + case "$THE_STL" in stlport-static) AOSP_STL_INC="$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/stlport/" @@ -307,11 +313,19 @@ case "$THE_STL" in AOSP_STL_LIB="$ANDROID_NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$AOSP_TOOLCHAIN_SUFFIX/libs/$AOSP_ABI/libgnustl_shared.so" ;; llvm-static) - AOSP_STL_INC="$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/libcxx/include" + if [ ! -d "$LLVM_INCLUDE_DIR" ]; then + echo "ERROR: Unable to locate include LLVM directory at $LLVM_INCLUDE_DIR -- has it moved since NDK r16beta1?" + [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1 + fi + AOSP_STL_INC="$LLVM_INCLUDE_DIR" AOSP_STL_LIB="$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$AOSP_ABI/libc++_static.a" ;; llvm|llvm-shared) - AOSP_STL_INC="$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/libcxx/include" + if [ ! -d "$LLVM_INCLUDE_DIR" ]; then + echo "ERROR: Unable to locate LLVM include directory at $LLVM_INCLUDE_DIR -- has it moved since NDK r16beta1?" + [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1 + fi + AOSP_STL_INC="$LLVM_INCLUDE_DIR" AOSP_STL_LIB="$ANDROID_NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$AOSP_ABI/libc++_shared.so" ;; *)