diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-22 12:31:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-22 12:31:09 -0700 |
| commit | 8fff4bff4de6b1a997d41a54a82ebf643759d49a (patch) | |
| tree | 591e9b4f2391a54de3bb55682282ca4e9fd9941b /native | |
| parent | b063e7903e49bc4689bd54ebe39e8094a58b910b (diff) | |
| parent | 4f734cabd0737d5e06bb5a2b9036d4b620c4ad17 (diff) | |
| download | frameworks_base-8fff4bff4de6b1a997d41a54a82ebf643759d49a.zip frameworks_base-8fff4bff4de6b1a997d41a54a82ebf643759d49a.tar.gz frameworks_base-8fff4bff4de6b1a997d41a54a82ebf643759d49a.tar.bz2 | |
am 4f734cab: am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread
Diffstat (limited to 'native')
| -rw-r--r-- | native/copy-to-ndk.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/native/copy-to-ndk.sh b/native/copy-to-ndk.sh index 4f5a16a..6470892 100644 --- a/native/copy-to-ndk.sh +++ b/native/copy-to-ndk.sh @@ -10,7 +10,7 @@ copyndkheaders() { local DST_HEADERS=$NDK_PLATFORMS/$CURR_PLATFORM local SRC_LIB_ANDROID=$ANDROID_PRODUCT_OUT/system/lib/libandroid.so - local DST_LIB_ANDROID=$NDK_PLATFORMS/$CURR_PLATFORM/arch-arm/usr/lib/libandroid.so + local DST_LIB_ANDROID=$NDK_PLATFORMS/$CURR_PLATFORM/arch-arm/lib/libandroid.so local didsomething="" @@ -20,9 +20,9 @@ copyndkheaders() { local src=$SRC_HEADERS/$i local changed="" for j in $ALL_PLATFORMS; do - local dst=$NDK_PLATFORMS/$j/arch-arm/usr/include/android/$i + local dst=$NDK_PLATFORMS/$j/include/android/$i if [ "$changed" == "" -a -e $dst ]; then - #echo "Exists: $dst" + echo "Exists: $dst" if diff $src $dst >/dev/null; then echo "$i: has not changed from $j" >/dev/null changed="false" @@ -34,13 +34,13 @@ copyndkheaders() { done if [ "$changed" == "true" -o "$changed" == "" ]; then echo "Updating: $i" - cp $src $NDK_PLATFORMS/$CURR_PLATFORM/arch-arm/usr/include/android/$i + cp $src $NDK_PLATFORMS/$CURR_PLATFORM/include/android/$i didsomething="true" fi done if diff $SRC_LIB_ANDROID $DST_LIB_ANDROID >/dev/null; then - echo "libandroid.so: has not changed" >/dev/null + echo "libandroid.so: has not changed" else echo "Updating: $DST_LIB_ANDROID" cp $SRC_LIB_ANDROID $DST_LIB_ANDROID |