miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent parallel execution of AndroidBuild.sh

Browse Source
This commit is contained in:
Sergii Pylypenko
2013-11-28 20:45:20 +02:00
parent 3d103698c7
commit 4dec8cbe2a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/application/Android.mk
View File

@@ -72,6 +72,8 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
# Also I cannot just launch AndroidBuild.sh from makefile because other libraries are not rebuilt and linking will fail
.PHONY: OVERRIDE_CUSTOM_LIB
OVERRIDE_CUSTOM_LIB:
# Prevent ./AndroidBuild.sh to be invoked in parallel for different architectures, it may do things like downloading files which work poorly when launched in parallel
.NOTPARALLEL: $(LOCAL_PATH)/src/libapplication-armeabi.so $(LOCAL_PATH)/src/libapplication-armeabi-v7a.so $(LOCAL_PATH)/src/libapplication-mips.so $(LOCAL_PATH)/src/libapplication-x86.so
LOCAL_PATH_SDL_APPLICATION := $(LOCAL_PATH)

3
project/jni/application/dosbox/AndroidBuild.sh
View File

@@ -6,8 +6,7 @@ ln -sf libsdl_sound.so ../../../obj/local/$1/libSDL_sound.so
[ -e $1/dosbox-0.74 ] || {
mkdir -p $1
[ -e dosbox-0.74.tar.gz ] || wget http://sourceforge.net/projects/dosbox/files/dosbox/0.74/dosbox-0.74.tar.gz || exit 1
cd $1 && tar xvf ../dosbox-0.74.tar.gz && patch -p0 < ../dosbox-0.74-androidSDL.diff && cd .. || exit 1
cd $1 && curl -L http://sourceforge.net/projects/dosbox/files/dosbox/0.74/dosbox-0.74.tar.gz | tar xvz && patch -p0 < ../dosbox-0.74-androidSDL.diff && cd .. || exit 1
} || exit 1
[ -e $1/dosbox-0.74/Makefile ] || {