commit 1baebcdcb2f1f3d794c837166b925538fcd28acb
author Stephen Hines <srhines@google.com> Tue May 06 10:08:53 2014 -0700
committer Stephen Hines <srhines@google.com> Tue May 06 10:08:53 2014 -0700
tree c4e72bd57ca50e5fcf4f7c8aa9184c37a0ef2476
parent a5b0367f8875425596f4f7a3e939f9bc03209162

Add libc++* libraries to update_rs_prebuilts.sh and search obj/ if needed.

Change-Id: I045e1118fede764272c9580cce8a81880d7a2c9f

update_rs_prebuilts.sh

diff --git a/update_rs_prebuilts.sh b/update_rs_prebuilts.sh
index d22253d..c9e3ecd 100755
--- a/update_rs_prebuilts.sh
+++ b/update_rs_prebuilts.sh
@@ -122,14 +122,15 @@
   for i in $(seq 0 $((${#TARGETS[@]} - 1))); do
     t=${TARGETS[$i]}
     sys_lib_dir=$MY_ANDROID_DIR/out/target/product/${SYS_NAMES[$i]}/system/lib
+    obj_lib_dir=$MY_ANDROID_DIR/out/target/product/${SYS_NAMES[$i]}/obj/lib
     for a in `find renderscript/lib/$t -name \*.so`; do
       file=`basename $a`
-      cp `find $sys_lib_dir -name $file` $a || exit 4
+      cp `find $sys_lib_dir $obj_lib_dir -name $file | head -1` $a || exit 4
     done
 
     for a in `find renderscript/lib/$t -name \*.bc`; do
       file=`basename $a`
-      cp `find $HOST_LIB_DIR $sys_lib_dir -name $file` $a || exit 5
+      cp `find $HOST_LIB_DIR $sys_lib_dir $obj_lib_dir -name $file | head -1` $a || exit 5
     done
   done
 
@@ -153,6 +154,8 @@
 libbcc.$SONAME
 libbcinfo.$SONAME
 libclang.$SONAME
+libc++abi.$SONAME
+libc++.$SONAME
 libLLVM.$SONAME
 "