mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-30 10:26:58 +01:00
update build scripts to use newer NDK.
This commit is contained in:
parent
aeb073d4b8
commit
d0999d1944
4 changed files with 12 additions and 26 deletions
|
@ -1,4 +1,4 @@
|
|||
# -*- mode: Makefile; compile-command: "../../scripts/ndkbuild.sh"; -*-
|
||||
# -*- mode: Makefile; compile-command: "cd ../; ${NDK_ROOT}/ndk-build -j3"; -*-
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
|
|
@ -10,4 +10,4 @@
|
|||
# Indicates whether an apk should be generated for each density.
|
||||
split.density=false
|
||||
# Project target.
|
||||
target=android-5
|
||||
target=android-7
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -u -e
|
||||
|
||||
TAGNAME=""
|
||||
FILES=""
|
||||
|
||||
usage() {
|
||||
echo "Error: $*"
|
||||
echo "usage: $0 [--tag <name>] [<package-unsigned.apk>]" >&2
|
||||
|
@ -9,7 +14,6 @@ usage() {
|
|||
do_build() {
|
||||
WD=$(pwd)
|
||||
cd $(dirname $0)/../XWords4/
|
||||
pwd
|
||||
touch jni/Android.mk
|
||||
../scripts/ndkbuild.sh
|
||||
rm -rf bin/ gen/
|
||||
|
@ -17,7 +21,7 @@ do_build() {
|
|||
cd $WD
|
||||
}
|
||||
|
||||
while [ -n "$1" ]; do
|
||||
while [ "$#" -gt 0 ]; do
|
||||
case $1 in
|
||||
--tag) TAGNAME=$2
|
||||
git describe $TAGNAME || usage "$TAGNAME not a valid git tag"
|
||||
|
@ -52,7 +56,6 @@ if [ -z "$FILES" ]; then
|
|||
fi
|
||||
|
||||
for PACK_UNSIGNED in $FILES; do
|
||||
echo $FILE
|
||||
|
||||
PACK_SIGNED=$(basename $PACK_UNSIGNED)
|
||||
echo "base: $PACK_SIGNED"
|
||||
|
|
|
@ -1,33 +1,16 @@
|
|||
#!/bin/sh
|
||||
|
||||
APP=xwords4
|
||||
|
||||
OLDDIR=$(pwd)
|
||||
|
||||
if [ -z "$NDK_ROOT" ]; then
|
||||
echo -n "NDK_ROOT not set... "
|
||||
NDK_ROOT="$HOME/android-ndk-1.6_r1"
|
||||
if [ -d $NDK_ROOT ]; then
|
||||
echo "using $NDK_ROOT"
|
||||
else
|
||||
echo "NDK not found; install and set NDK_ROOT to point to it"
|
||||
exit 1
|
||||
fi
|
||||
echo "NDK not found; install and set NDK_ROOT to point to it"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd $(dirname $0)
|
||||
cd ../
|
||||
cd $(dirname $0)/../XWords4
|
||||
|
||||
if [ -h $NDK_ROOT/apps/$APP -a $(readlink $NDK_ROOT/apps/$APP) != $(pwd) ]; then
|
||||
rm $NDK_ROOT/apps/$APP
|
||||
fi
|
||||
if [ ! -h $NDK_ROOT/apps/$APP ]; then
|
||||
echo "adding symlink to apps"
|
||||
ln -sf $(pwd) $NDK_ROOT/apps/$APP
|
||||
fi
|
||||
|
||||
cd $NDK_ROOT
|
||||
make -j3 APP=$APP $*
|
||||
${NDK_ROOT}/ndk-build $*
|
||||
|
||||
cd $OLDDIR
|
||||
echo "$0 done"
|
||||
|
|
Loading…
Reference in a new issue