Merge commit 'refs/merge-requests/337' of gitorious.org:f-droid/fdroiddata
This commit is contained in:
commit
052fd100c9
|
@ -16,6 +16,7 @@ Repo Type:git-svn
|
||||||
Repo:http://smashwords-access-for-android.googlecode.com/svn/trunk/SmashwordsAccess
|
Repo:http://smashwords-access-for-android.googlecode.com/svn/trunk/SmashwordsAccess
|
||||||
|
|
||||||
Build:011 beta,11
|
Build:011 beta,11
|
||||||
|
disable=authentication problem:fixed in next version
|
||||||
commit=25
|
commit=25
|
||||||
extlibs=jsoup/jsoup-1.7.2.jar
|
extlibs=jsoup/jsoup-1.7.2.jar
|
||||||
srclibs=1:ActionBarSherlock@4.4.0;Smashwords-API@51;Google-Gson@1163;ImageLoader-Novoda@imageloader-parent-1.5.0
|
srclibs=1:ActionBarSherlock@4.4.0;Smashwords-API@51;Google-Gson@1163;ImageLoader-Novoda@imageloader-parent-1.5.0
|
||||||
|
|
|
@ -45,9 +45,9 @@ Build:10.3,161
|
||||||
prebuild=mkdir assets && \
|
prebuild=mkdir assets && \
|
||||||
cp -r $$RootTools$$/src/com/ src/ && \
|
cp -r $$RootTools$$/src/com/ src/ && \
|
||||||
cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
|
cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
|
||||||
sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
|
sed -i 's/darwin-x86_64/linux-x86/g;s/4.4.3/4.6/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
|
||||||
build=cd ../BB && \
|
build=cd ../BB && \
|
||||||
export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
|
export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:$PATH && \
|
||||||
make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
|
make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
|
||||||
mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png
|
mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue