No need to set NDK env vars anymore

This commit is contained in:
Daniel Martí 2014-07-02 15:01:52 +02:00
parent f8e1c0a5da
commit 0680d6e5f9
2 changed files with 16 additions and 25 deletions

View file

@ -33,7 +33,7 @@ Build:0.6.1,61
forceversion=yes forceversion=yes
forcevercode=yes forcevercode=yes
prebuild=rm -rf ../pspautotests/demos*/ prebuild=rm -rf ../pspautotests/demos*/
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
Build:0.70,70 Build:0.70,70
@ -43,7 +43,7 @@ Build:0.70,70
target=android-10 target=android-10
update=.,../native/android update=.,../native/android
prebuild=rm -rf ../pspautotests/demos*/ prebuild=rm -rf ../pspautotests/demos*/
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
Build:0.7.5,75 Build:0.7.5,75
@ -52,7 +52,7 @@ Build:0.7.5,75
submodules=yes submodules=yes
update=.,../native/android update=.,../native/android
prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
Build:0.7.6,76 Build:0.7.6,76
@ -61,7 +61,7 @@ Build:0.7.6,76
submodules=yes submodules=yes
update=.,../native/android update=.,../native/android
prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
Build:0.8,80 Build:0.8,80
@ -70,7 +70,7 @@ Build:0.8,80
submodules=yes submodules=yes
update=.,../native/android update=.,../native/android
prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
Build:0.8.1,81 Build:0.8.1,81
@ -79,7 +79,7 @@ Build:0.8.1,81
submodules=yes submodules=yes
update=.,../native/android update=.,../native/android
prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
Build:0.9.0,90 Build:0.9.0,90
@ -88,7 +88,7 @@ Build:0.9.0,90
submodules=yes submodules=yes
update=.,../native/android update=.,../native/android
prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
# dev forgot to bump AM.xml # dev forgot to bump AM.xml
@ -100,7 +100,7 @@ Build:0.9.1,91
forceversion=yes forceversion=yes
forcevercode=yes forcevercode=yes
prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
build=NDK=$$NDK$$ ./ab.sh build=./ab.sh
buildjni=no buildjni=no
Build:0.9.5-x86,951 Build:0.9.5-x86,951
@ -115,8 +115,7 @@ Build:0.9.5-x86,951
rm libs/libGoogleAnalytics* && \ rm libs/libGoogleAnalytics* && \
echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \
./ax86-build.sh && \ ./ax86-build.sh && \
cd ../android && \ cd ../android && \
@ -135,8 +134,7 @@ Build:0.9.5-armv7,953
rm libs/libGoogleAnalytics* && \ rm libs/libGoogleAnalytics* && \
echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
./android-build.sh && \ ./android-build.sh && \
cd ../android && \ cd ../android && \
@ -155,8 +153,7 @@ Build:0.9.6-x86,961
rm libs/libGoogleAnalytics* rm libs/libGoogleAnalytics*
scanignore=android/android-ndk-profiler scanignore=android/android-ndk-profiler
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \
./ax86-build.sh && \ ./ax86-build.sh && \
cd ../android && \ cd ../android && \
@ -175,8 +172,7 @@ Build:0.9.6-armv7,963
rm libs/libGoogleAnalytics* rm libs/libGoogleAnalytics*
scanignore=android/android-ndk-profiler scanignore=android/android-ndk-profiler
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
./android-build.sh && \ ./android-build.sh && \
cd ../android && \ cd ../android && \
@ -194,8 +190,7 @@ Build:0.9.7.1,9711
rm libs/libGoogleAnalytics* rm libs/libGoogleAnalytics*
scanignore=android/android-ndk-profiler scanignore=android/android-ndk-profiler
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
./android-build.sh && \ ./android-build.sh && \
cd ../android && \ cd ../android && \
@ -213,8 +208,7 @@ Build:0.9.7.1,9713
rm libs/libGoogleAnalytics* rm libs/libGoogleAnalytics*
scanignore=android/android-ndk-profiler scanignore=android/android-ndk-profiler
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \
./ax86-build.sh && \ ./ax86-build.sh && \
cd ../android && \ cd ../android && \
@ -232,8 +226,7 @@ Build:0.9.8,9801
rm libs/libGoogleAnalytics* rm libs/libGoogleAnalytics*
scanignore=android/android-ndk-profiler scanignore=android/android-ndk-profiler
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \
./ax86-build.sh && \ ./ax86-build.sh && \
cd ../android && \ cd ../android && \
@ -251,8 +244,7 @@ Build:0.9.8,9803
rm libs/libGoogleAnalytics* rm libs/libGoogleAnalytics*
scanignore=android/android-ndk-profiler scanignore=android/android-ndk-profiler
scandelete=ffmpeg scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \ build=cd ../ffmpeg && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \ sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
./android-build.sh && \ ./android-build.sh && \
cd ../android && \ cd ../android && \

View file

@ -24,7 +24,6 @@ Build:0.9.11,1
subdir=yabause/src/android subdir=yabause/src/android
patch=toolchain.patch patch=toolchain.patch
build=echo "APP_CFLAGS+=-Wno-error=format-security" > jni/Application.mk && \ build=echo "APP_CFLAGS+=-Wno-error=format-security" > jni/Application.mk && \
export ANDROID_NDK="$$NDK$$" && \
cd ../.. && \ cd ../.. && \
export PATH="$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin" && \ export PATH="$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin" && \
cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake -DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android -DYAB_PORTS=android . && \ cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake -DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android -DYAB_PORTS=android . && \