Merge branch 'OSMonitor' into 'master'

Update OSMonitor

See merge request !598
This commit is contained in:
Boris Kraut 2015-03-02 16:59:25 +00:00
commit b79a2096b0

View file

@ -215,6 +215,27 @@ Build:3.4.0.8,80
mv libs/mips/osmcore_pie assets/osmcore_mips_pie && \
mv libs/x86/osmcore_pie assets/osmcore_x86_pie
Build:3.4.0.9,81
commit=9a5e5f5e46bc73d904fd0e18778fe3bd83e84a21
subdir=OSMonitor
srclibs=1:Support/v7/appcompat@android-5.0.1_r1,2:Volley@android-5.0.1_r1,3:ColorPicker-eolwral@788621da0c
rm=OSMonitor/jni/src/google/protobuf/testdata/golden*
extlibs=android/android-support-v4.jar
prebuild=mv libs/android-support-v4.jar $$Support$$/libs/ && \
echo -e 'java.source=1.7\njava.target=1.7' > $$Support$$/ant.properties && \
mv jni jni_
target=android-21
ndk=r10d
build=mv jni_ jni && \
$$NDK$$/ndk-build && \
mkdir -p assets && \
mv libs/armeabi/osmcore assets/osmcore_arm && \
mv libs/mips/osmcore assets/osmcore_mips && \
mv libs/x86/osmcore assets/osmcore_x86 && \
mv libs/armeabi/osmcore_pie assets/osmcore_arm_pie && \
mv libs/mips/osmcore_pie assets/osmcore_mips_pie && \
mv libs/x86/osmcore_pie assets/osmcore_x86_pie
Maintainer Notes:
Once jni builds properly and there is a new release out, do: