No need to export ANDROID_* variables anymore

This commit is contained in:
Daniel Martí 2014-07-02 15:11:53 +02:00
parent 0680d6e5f9
commit f4d1bc4bae
7 changed files with 27 additions and 29 deletions

View File

@ -37,7 +37,7 @@ Build:1.02.00-2423,2423
sed -i '/silk/d' jni/Android.mk
scanignore=CSipSimple/jni/webrtc/sources/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java,CSipSimple/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
scandelete=CSipSimple/obj,CSipSimple/libs
build=make SWIG=swig ANDROID_NDK=$$NDK$$ ANDROID_SDK=$$SDK$$
build=make SWIG=swig
buildjni=no
Maintainer Notes:

View File

@ -121,7 +121,7 @@ Build:0.9.6.4,25
Build:0.9.7,26
commit=0.9.7
submodules=yes
init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && \
init=mvn clean install -f submodules/dslv/pom.xml && \
rm -f submodules/dslv/demo/target/*.apk
maven=yes
prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
@ -130,7 +130,7 @@ Build:0.9.7.1,28
disable=bad bug (at 0.9.7.1)
commit=0.9.7.1
submodules=yes
init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && \
init=mvn clean install -f submodules/dslv/pom.xml && \
rm -f submodules/dslv/demo/target/*.apk
maven=yes
prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
@ -138,7 +138,7 @@ Build:0.9.7.1,28
Build:0.9.7.2,29
commit=0.9.7.2
submodules=yes
init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && \
init=mvn clean install -f submodules/dslv/pom.xml && \
rm -f submodules/dslv/demo/target/*.apk
maven=yes
prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
@ -146,7 +146,7 @@ Build:0.9.7.2,29
Build:0.9.7.3,30
commit=0.9.7.3
submodules=yes
init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && \
init=mvn clean install -f submodules/dslv/pom.xml && \
rm -f submodules/dslv/demo/target/*.apk
maven=yes
prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
@ -154,7 +154,7 @@ Build:0.9.7.3,30
Build:0.9.7.4,31
commit=0.9.7.4
submodules=yes
init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && \
init=mvn clean install -f submodules/dslv/pom.xml && \
rm -f submodules/dslv/demo/target/*.apk
maven=yes
prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && \

View File

@ -108,7 +108,7 @@ Build:1.6.5,165
prebuild=sed -i 's/app_version">[^<]*/app_version">1.6.5/' res/values/no_translate.xml && \
echo -e 'NDK_TOOLCHAIN_VERSION := 4.8\nAPP_ABI := armeabi armeabi-v7a x86 mips\nOSMAND_SKIP_NEON_SUPPORT := false\nOSMAND_FORCE_NEON_SUPPORT := false\nAPP_OPTIM := release' >> jni/Application.mk
build=sed -i 's/EXTERNAL_DEPENDENCIES=(/EXTERNAL_DEPENDENCIES=(boost-android /' full-ndk-build.sh && \
ANDROID_SDK=$$SDK$$ ./full-ndk-build.sh && \
./full-ndk-build.sh && \
ant jar native-libs -f ../../tools/OsmAndMapCreator/build.xml && \
ant build -f ../OsmAnd-java/build.xml
buildjni=no

View File

@ -26,7 +26,6 @@ Build:1.6,1
cd src/dependencies && \
make all
build=NDK_PATH=$$NDK$$ && \
ANDROID_HOME=$$SDK$$ && \
./build-android-with-native.py --toolchain --lzma --zim --kiwix --strip
Maintainer Notes:

View File

@ -40,8 +40,7 @@ Build:1.5.0,6
patch=fdroid_build.patch,latest_sdk.patch,jdk7.patch
prebuild=set -- $$SDK$$/build-tools/*/aapt && \
sed -e "s|\$(ANDROID_SDK)/build-tools/\*/aapt|$1|" -i backends/platform/android/android.mk
build=export ANDROID_SDK="$$SDK$$" ANDROID_NDK="$$NDK$$" && \
chmod +x fdroid_build && \
build=chmod +x fdroid_build && \
./fdroid_build tremor $$Tremor$$ && \
./fdroid_build mad && \
./fdroid_build flac $$FLAC$$ && \

View File

@ -27,7 +27,7 @@ Build:0.0.11-ARMv7,110
prebuild=sed -i '48d' ../Makefile
update=.,../java-libs/SlidingMenu,../java-libs/ActionBarSherlock
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:0.0.11-ARM,111
@ -38,7 +38,7 @@ Build:0.0.11-ARM,111
prebuild=sed -i '48d' ../Makefile
update=.,../java-libs/SlidingMenu,../java-libs/ActionBarSherlock
build=cd ../ && \
ANDROID_ABI=armeabi ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi ./compile.sh release
buildjni=no
Build:0.0.11-x86,112
@ -50,7 +50,7 @@ Build:0.0.11-x86,112
prebuild=sed -i '48d' ../Makefile
update=.,../java-libs/SlidingMenu,../java-libs/ActionBarSherlock
build=cd ../ && \
ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.0.11-mips,113
@ -61,7 +61,7 @@ Build:0.0.11-mips,113
prebuild=sed -i '48d' ../Makefile
update=.,../java-libs/SlidingMenu,../java-libs/ActionBarSherlock
build=cd ../ && \
ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=mips ./compile.sh release
buildjni=no
Build:0.1.3-MIPS,1301
@ -75,7 +75,7 @@ Build:0.1.3-MIPS,1301
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=mips ./compile.sh release
buildjni=no
Build:0.1.3-x86,1302
@ -88,7 +88,7 @@ Build:0.1.3-x86,1302
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.1.3-ARM,1303
@ -101,7 +101,7 @@ Build:0.1.3-ARM,1303
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi ./compile.sh release
buildjni=no
Build:0.1.3-ARMv7,1304
@ -114,7 +114,7 @@ Build:0.1.3-ARMv7,1304
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:0.9.0,9002
@ -125,7 +125,7 @@ Build:0.9.0,9002
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.9.0,9004
@ -136,7 +136,7 @@ Build:0.9.0,9004
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:0.9.1,9102
@ -147,7 +147,7 @@ Build:0.9.1,9102
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.9.1,9104
@ -158,7 +158,7 @@ Build:0.9.1,9104
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:0.9.5,9502
@ -170,7 +170,7 @@ Build:0.9.5,9502
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.9.5,9504
@ -182,7 +182,7 @@ Build:0.9.5,9504
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
Build:0.9.6,9602
@ -193,7 +193,7 @@ Build:0.9.6,9602
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=x86 ./compile.sh release
buildjni=no
Build:0.9.6,9604
@ -204,7 +204,7 @@ Build:0.9.6,9604
prebuild=sed -i '/ant/d' ../Makefile && \
ln -s vlc-android/$$VLC-2.2$$ ../vlc
build=cd ../ && \
ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
ANDROID_ABI=armeabi-v7a ./compile.sh release
buildjni=no
# +0: - (upstream)

View File

@ -21,7 +21,7 @@ Build:6.7.3,92
submodules=yes
output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
build=cd .. && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n ANDROID_SDK=$ANDROID_HOME -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
break; done
Build:6.7.4,93
@ -30,7 +30,7 @@ Build:6.7.4,93
submodules=yes
output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
build=cd .. && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n ANDROID_SDK=$ANDROID_HOME -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
break; done
Build:6.7.5,94
@ -39,7 +39,7 @@ Build:6.7.5,94
submodules=yes
output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
build=cd .. && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n ANDROID_SDK=$ANDROID_HOME -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
break; done
Maintainer Notes: