commit 375fbfe378eeb1491e5292b36a9cead00b23f2b1
author Dan Albert <danalbert@google.com> Mon Sep 14 16:36:51 2015 -0700
committer Dan Albert <danalbert@google.com> Mon Sep 14 16:40:40 2015 -0700
tree 5bab98fbb6dd19da67bcc460a4b4f67cd6974cf0
parent 3a21823d3e4e8e15fa25b61652d5305e1dc12dfa

Fix detection of thumb STL libraries.

I think the CWD must have changed when I moved us to using
build_support.py, which means we no longer find the thumb libraries
and don't try to package them.

Note that we don't need to correct the paths that we actually add for
packaging because pack_archive will cd into the right directory for
that operation anyway.

Change-Id: Ia8ee9bc056d8570829f77b0c19d050a71cb564ea

build/tools/build-cxx-stl.sh

diff --git a/build/tools/build-cxx-stl.sh b/build/tools/build-cxx-stl.sh
index edcc0eb..62f7399 100755
--- a/build/tools/build-cxx-stl.sh
+++ b/build/tools/build-cxx-stl.sh
@@ -671,7 +671,7 @@
         FILES=""
         LIB_SUFFIX="$(get_lib_suffix_for_abi $ABI)"
         for LIB in ${CXX_STL_LIB}_static.a ${CXX_STL_LIB}_shared${LIB_SUFFIX}; do
-	    if [ -d "$CXX_STL_SUBDIR/libs/$ABI/thumb" ]; then
+            if [ -d "$ANDROID_NDK_ROOT/$CXX_STL_SUBDIR/libs/$ABI/thumb" ]; then
                 FILES="$FILES $CXX_STL_SUBDIR/libs/$ABI/thumb/$LIB"
             fi
             FILES="$FILES $CXX_STL_SUBDIR/libs/$ABI/$LIB"