Copy thumb version of gnustl to standalone package
Previously for ARM only arm-mode libraries are copied and duplicated
in arm-linux-androideabi/lib/thumb/ and arm-linux-androideabi/lib/armv7-a/thumb/.
This CL copy thumb version to /thumb
Change-Id: Ic20c09cf505d87b9dfe37aaf36dc91e47786de16
diff --git a/build/tools/make-standalone-toolchain.sh b/build/tools/make-standalone-toolchain.sh
index 8819bb3..35aa264 100755
--- a/build/tools/make-standalone-toolchain.sh
+++ b/build/tools/make-standalone-toolchain.sh
@@ -481,10 +481,15 @@
local ABI2=$2
case $STL in
gnustl)
+ # gnustl has thumb version of libraries. Append ABI with basename($ABI2) if $ABI2 contain '/'
+ ABI1=$ABI
+ if [ "$ABI2" != "${ABI2%%/*}" ] ; then
+ ABI1=$ABI/`basename $ABI2`
+ fi
copy_directory "$GNUSTL_LIBS/$ABI/include/bits" "$ABI_STL_INCLUDE_TARGET/$ABI2/bits"
- copy_file_list "$GNUSTL_LIBS/$ABI" "$ABI_STL/lib/$ABI2" "libgnustl_shared.so"
- copy_file_list "$GNUSTL_LIBS/$ABI" "$ABI_STL/lib/$ABI2" "libsupc++.a"
- cp -p "$GNUSTL_LIBS/$ABI/libgnustl_static.a" "$ABI_STL/lib/$ABI2/libstdc++.a"
+ copy_file_list "$GNUSTL_LIBS/$ABI1" "$ABI_STL/lib/$ABI2" "libgnustl_shared.so"
+ copy_file_list "$GNUSTL_LIBS/$ABI1" "$ABI_STL/lib/$ABI2" "libsupc++.a"
+ cp -p "$GNUSTL_LIBS/$ABI1/libgnustl_static.a" "$ABI_STL/lib/$ABI2/libstdc++.a"
;;
stlport)
if [ "$ARCH_STL" != "$ARCH" ]; then
@@ -511,7 +516,7 @@
case $ARCH in
arm)
copy_stl_libs armeabi ""
- copy_stl_libs armeabi "thumb"
+ copy_stl_libs armeabi "/thumb"
copy_stl_libs armeabi-v7a "armv7-a"
copy_stl_libs armeabi-v7a "armv7-a/thumb"
;;