drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update script for copying NDK headers/library." into gingerbread

Browse Source
This commit is contained in:
Dianne Hackborn
2010-10-22 10:58:35 -07:00
committed by Android (Google) Code Review
parent 7c68bc3867 de5ba5ef72
commit 7ce276b5a3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
native/copy-to-ndk.sh
View File

@ -10,7 +10,7 @@ copyndkheaders() {
local DST_HEADERS=$NDK_PLATFORMS/$CURR_PLATFORM local DST_HEADERS=$NDK_PLATFORMS/$CURR_PLATFORM
local SRC_LIB_ANDROID=$ANDROID_PRODUCT_OUT/system/lib/libandroid.so 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="" local didsomething=""
@ -20,9 +20,9 @@ copyndkheaders() {
local src=$SRC_HEADERS/$i local src=$SRC_HEADERS/$i
local changed="" local changed=""
for j in $ALL_PLATFORMS; do 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 if [ "$changed" == "" -a -e $dst ]; then
#echo "Exists: $dst" echo "Exists: $dst"
if diff $src $dst >/dev/null; then if diff $src $dst >/dev/null; then
echo "$i: has not changed from $j" >/dev/null echo "$i: has not changed from $j" >/dev/null
changed="false" changed="false"
@ -34,13 +34,13 @@ copyndkheaders() {
done done
if [ "$changed" == "true" -o "$changed" == "" ]; then if [ "$changed" == "true" -o "$changed" == "" ]; then
echo "Updating: $i" 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" didsomething="true"
fi fi
done done
if diff $SRC_LIB_ANDROID $DST_LIB_ANDROID >/dev/null; then 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 else
echo "Updating: $DST_LIB_ANDROID" echo "Updating: $DST_LIB_ANDROID"
cp $SRC_LIB_ANDROID $DST_LIB_ANDROID cp $SRC_LIB_ANDROID $DST_LIB_ANDROID