Merge branch 'update_android-xmp' into 'master'

Update Xmp Mod Player to 4.3.1 (73) (WIP)

Currently no native libs on ndk r10d are build locally and i have no clue why. Using the method from the older builds also lead to no native libs so this could be also just a local problem on my NDK r9b/r10d Setup.

This also needs the updated android-support-v4.jar from !498

See merge request !512
This commit is contained in:
Boris Kraut 2015-01-29 16:15:49 +00:00
commit 64603e5117
2 changed files with 27 additions and 3 deletions

View file

@ -12,6 +12,8 @@ over 90 mainstream and obscure module formats from Amiga, Atari, Acorn,
Apple IIgs and PC. All module formats are supported, but external file Apple IIgs and PC. All module formats are supported, but external file
compressors are not. Some examples are provided and can be seen when you compressors are not. Some examples are provided and can be seen when you
browse /sdcard/mod from the app and sites that distribute more are listed on the website. browse /sdcard/mod from the app and sites that distribute more are listed on the website.
[http://sourceforge.net/p/xmp/xmp-android/ci/master/tree/res/values/strings.xml Changelog]
. .
Repo Type:git Repo Type:git
@ -122,10 +124,28 @@ Build:3.10.0,57
scanignore=jni/Libxmp/obj/local/armeabi-v7a/libxmp.a,jni/Libxmp/obj/local/x86/libxmp.a,jni/Libxmp/obj/local/armeabi/libxmp.a scanignore=jni/Libxmp/obj/local/armeabi-v7a/libxmp.a,jni/Libxmp/obj/local/x86/libxmp.a,jni/Libxmp/obj/local/armeabi/libxmp.a
buildjni=yes buildjni=yes
Maintainer Notes: Build:4.3.1,73
See changelog (in res/values/strings.xml) to determine libxmp version. disable=WIP, see maintainer notes
commit=android-4.3.1
srclibs=Libxmp@libxmp-4.3.3,1:Support/v7/appcompat@android-5.0.1_r1,2:Support/v7/gridlayout@android-5.0.1_r1,3:Volley@android-5.0.1_r1,Groundy@0f16c8e30e543d3a017a884530e179a0de65db50
extlibs=android/android-support-v4.jar
rm=libs/*.jar,doc/xmp-android.asta
target=android-21
prebuild=sed -i 's;../../../libxmp;../$$Libxmp$$;' jni/Android.mk && \
pushd $$Libxmp$$ && autoconf && ./configure && popd && \
mkdir -p $$Support$$/libs && \
cp libs/android-support-v4.jar $$Support$$/libs && \
mv libs/android-support-v4.jar $$Support$$/../gridlayout/libs && \
echo -e "java.source=7\njava.target=7" >> $$Support$$/local.properties
buildjni=yes
build=pushd $$Libxmp$$ && $$NDK$$/ndk-build && popd && \
pushd $$Groundy$$ && gradle jar && popd && \
mv $$Groundy$$/build/libs/groundy-1.5.jar libs/
ndk=r10d
Running ndk-build in prebuild is awkward. Please simplify prebuild. Maintainer Notes:
The most recent libxmp version should be finde for all builds.
No native libs, even with the old method on r10d are build locally.
. .
Auto Update Mode:None Auto Update Mode:None

4
srclibs/Groundy.txt Normal file
View file

@ -0,0 +1,4 @@
Repo Type:git
Repo:https://github.com/telly/groundy.git
Subdir:library