diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2015-05-11 14:36:37 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2015-05-19 13:33:38 -0700 |
| commit | f562784573ebf580bc0c691509922b292e71b1d2 (patch) | |
| tree | bb8a21672743e35bb396e263cc32f8fc4f9fee10 | |
| parent | 9a6bbddf6c9cc9ff8c9092bbc4f915d4afdbda34 (diff) | |
| download | android_frameworks_rs-f562784573ebf580bc0c691509922b292e71b1d2.tar.gz android_frameworks_rs-f562784573ebf580bc0c691509922b292e71b1d2.tar.bz2 android_frameworks_rs-f562784573ebf580bc0c691509922b292e71b1d2.zip | |
Adapt update_rs_prebuilts.sh to new SDK layout
The structure of SDK prebuilts has changed. The files go into lib,
lib64 or bin subdirectories in prebuilts/sdk/tools/<OS>. Adapt
update_rs_prebuilts.sh to this layout. Currently, lib/ has just the
32-bit version of libc++.so
Change-Id: I11fc114ee0c888f2c54cb92db9e5084ca921fba5
(cherry picked from commit 9b0ec105175dc668cf4f373bdccc74f465fcb831)
| -rwxr-xr-x | update_rs_prebuilts.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/update_rs_prebuilts.sh b/update_rs_prebuilts.sh index 2526384e..89d7ac1b 100755 --- a/update_rs_prebuilts.sh +++ b/update_rs_prebuilts.sh @@ -161,14 +161,21 @@ libc++.$SONAME libLLVM.$SONAME " +TOOLS_LIB32="libc++.$SONAME" + for a in $TOOLS_BIN; do - cp $ANDROID_HOST_OUT/bin/$a tools/$SHORT_OSNAME/ - strip tools/$SHORT_OSNAME/$a + cp $ANDROID_HOST_OUT/bin/$a tools/$SHORT_OSNAME/bin + strip tools/$SHORT_OSNAME/bin/$a done for a in $TOOLS_LIB; do - cp $HOST_LIB64_DIR/$a tools/$SHORT_OSNAME/ - strip tools/$SHORT_OSNAME/$a + cp $HOST_LIB64_DIR/$a tools/$SHORT_OSNAME/lib64 + strip tools/$SHORT_OSNAME/lib64/$a +done + +for a in $TOOLS_LIB32; do + cp $HOST_LIB_DIR/$a tools/$SHORT_OSNAME/lib + strip tools/$SHORT_OSNAME/lib/$a done if [ $DARWIN -eq 0 ]; then |