Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distribute.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function push_arm() {

# this must be something depending of the API level of Android
export PATH="$ANDROIDNDK/toolchains/arm-eabi-4.4.0/prebuilt/linux-x86/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH"
if [ "X$ANDROIDNDKVER" == "Xr7" ]; then
if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ]; then
export TOOLCHAIN_PREFIX=arm-linux-androideabi
export TOOLCHAIN_VERSION=4.4.3
elif [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
Expand Down
3 changes: 2 additions & 1 deletion src/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,9 @@ def make_package(args):
args=args)

# Update the project to a recent version.
android_api = 'android-%s' % os.environ.get('ANDROIDAPI', '8')
try:
subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t', 'android-8'])
subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t', android_api])
except (OSError, IOError):
print 'An error occured while calling', ANDROID, 'update'
print 'Your PATH must include android tools.'
Expand Down