Merge branch 'fix_osmonitor' into 'master'

OS Monitor: Fix broken version 3.4.0.0

Please merge this not before the next build cycle which removes the broken .apk: !534

See merge request !535
This commit is contained in:
Boris Kraut 2015-01-31 21:35:41 +00:00
commit 47dd5fc716

View file

@ -176,7 +176,6 @@ Build:3.3.1.1,71
mv libs/x86/osmcore assets/osmcore_x86 mv libs/x86/osmcore assets/osmcore_x86
Build:3.4.0.0,73 Build:3.4.0.0,73
disable=no working build, needs check of jni build
commit=54db6e8c7083cbd703feddbd1c080f8264aba59a commit=54db6e8c7083cbd703feddbd1c080f8264aba59a
subdir=OSMonitor subdir=OSMonitor
srclibs=1:Support/v7/appcompat@android-5.0.1_r1,2:Volley@android-5.0.1_r1,3:ColorPicker-eolwral@788621da0c srclibs=1:Support/v7/appcompat@android-5.0.1_r1,2:Volley@android-5.0.1_r1,3:ColorPicker-eolwral@788621da0c
@ -191,7 +190,10 @@ Build:3.4.0.0,73
mkdir -p assets && \ mkdir -p assets && \
mv libs/armeabi/osmcore assets/osmcore_arm && \ mv libs/armeabi/osmcore assets/osmcore_arm && \
mv libs/mips/osmcore assets/osmcore_mips && \ mv libs/mips/osmcore assets/osmcore_mips && \
mv libs/x86/osmcore assets/osmcore_x86 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: Maintainer Notes:
Once jni builds properly and there is a new release out, do: Once jni builds properly and there is a new release out, do: