diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-21 21:10:26 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-10-21 21:10:26 -0700 |
| commit | de5ba5ef7274f993d1612d3f902f27545aa99c8d (patch) | |
| tree | 38d0e014b75cd545f1c30c0c938d5910228ed780 /native | |
| parent | fdbb2168f7a9a202ee9406d65e7ef98a6745b488 (diff) | |
| download | frameworks_base-de5ba5ef7274f993d1612d3f902f27545aa99c8d.zip frameworks_base-de5ba5ef7274f993d1612d3f902f27545aa99c8d.tar.gz frameworks_base-de5ba5ef7274f993d1612d3f902f27545aa99c8d.tar.bz2 | |
Update script for copying NDK headers/library.
Change-Id: Ia441ce37123d5b5cd343f2746671495705501fb5
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 |