From 4dec8cbe2a028c161b950f7b58c8219db4dab190 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 28 Nov 2013 20:45:20 +0200 Subject: [PATCH] Prevent parallel execution of AndroidBuild.sh --- project/jni/application/Android.mk | 2 ++ project/jni/application/dosbox/AndroidBuild.sh | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index 2c0926885..717f70ec5 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -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) diff --git a/project/jni/application/dosbox/AndroidBuild.sh b/project/jni/application/dosbox/AndroidBuild.sh index 0bdbf5506..461de594a 100755 --- a/project/jni/application/dosbox/AndroidBuild.sh +++ b/project/jni/application/dosbox/AndroidBuild.sh @@ -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 ] || {