Merge branch 'OSMonitor' into 'master'
Update OS Monitor See merge request !219
This commit is contained in:
commit
85c780176f
|
@ -30,8 +30,8 @@ Build:2.0.5,28
|
|||
Build:3.0.6.4,41
|
||||
commit=667a709a0
|
||||
subdir=OSMonitor
|
||||
encoding=latin1
|
||||
srclibs=1:ActionBarSherlock@4.3.1
|
||||
encoding=latin1
|
||||
prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
|
||||
sed -i 's/osinfo/osInfo/g' jni/include/core/os.h && \
|
||||
sed -i 's/ConnectionInfo.pb.h/connectionInfo.pb.h/g' jni/include/core/connection.h
|
||||
|
@ -43,8 +43,8 @@ Build:3.0.6.4,41
|
|||
Build:3.0.6.5,42
|
||||
commit=330fc16
|
||||
subdir=OSMonitor
|
||||
extlibs=android/android-support-v4.jar
|
||||
srclibs=1:ActionBarSherlock@4.3.1
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
|
||||
build=$$NDK$$/ndk-build && \
|
||||
mv libs/armeabi/osmcore assets/osmcore_arm && \
|
||||
|
@ -54,8 +54,8 @@ Build:3.0.6.5,42
|
|||
Build:3.0.6.6,43
|
||||
commit=3.0.6.6
|
||||
subdir=OSMonitor
|
||||
extlibs=android/android-support-v4.jar
|
||||
srclibs=1:ActionBarSherlock@4.3.1
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
|
||||
build=$$NDK$$/ndk-build && \
|
||||
mv libs/armeabi/osmcore assets/osmcore_arm && \
|
||||
|
@ -66,8 +66,8 @@ Build:3.0.7.0,48
|
|||
disable=doesn't show any data
|
||||
commit=3.0.7.0
|
||||
subdir=OSMonitor
|
||||
extlibs=android/android-support-v4.jar
|
||||
srclibs=1:ActionBarSherlock@4.4.0
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
|
||||
build=$$NDK$$/ndk-build && \
|
||||
mv libs/armeabi/osmcore assets/osmcore_arm && \
|
||||
|
@ -77,8 +77,8 @@ Build:3.0.7.0,48
|
|||
Build:3.0.7.2,50
|
||||
commit=3.0.7.2
|
||||
subdir=OSMonitor
|
||||
extlibs=android/android-support-v4.jar
|
||||
srclibs=1:ActionBarSherlock@4.4.0
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
|
||||
build=$$NDK$$/ndk-build && \
|
||||
mv libs/armeabi/osmcore assets/osmcore_arm && \
|
||||
|
@ -88,8 +88,8 @@ Build:3.0.7.2,50
|
|||
Build:3.0.8.2,53
|
||||
commit=3.0.8.2
|
||||
subdir=OSMonitor
|
||||
extlibs=android/android-support-v4.jar
|
||||
srclibs=1:Support/v7/appcompat@android-4.4_r1.1,2:Volley@android-4.4_r1.2
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=mv libs/android-support-v4.jar $$Support$$/libs/
|
||||
scanignore=OSMonitor/assets/osmcore_arm
|
||||
build=$$NDK$$/ndk-build && \
|
||||
|
@ -100,11 +100,26 @@ Build:3.0.8.2,53
|
|||
Build:3.0.9.0,54
|
||||
commit=3.0.9.0
|
||||
subdir=OSMonitor
|
||||
target=android-19
|
||||
extlibs=android/android-support-v4.jar
|
||||
srclibs=1:Support/v7/appcompat@android-4.4_r1.1,2:Volley@android-4.4_r1.2,3:ColorPicker-eolwral@788621da0c
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=mv libs/android-support-v4.jar $$Support$$/libs/ && \
|
||||
mv jni jni_
|
||||
target=android-19
|
||||
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
|
||||
|
||||
Build:3.3.0.2,66
|
||||
commit=5959f36528
|
||||
subdir=OSMonitor
|
||||
srclibs=1:Support/v7/appcompat@android-4.4_r1.1,2:Volley@android-4.4_r1.2,3:ColorPicker-eolwral@788621da0c
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=mv libs/android-support-v4.jar $$Support$$/libs/ && \
|
||||
mv jni jni_
|
||||
target=android-19
|
||||
build=mv jni_ jni && \
|
||||
$$NDK$$/ndk-build && \
|
||||
mkdir -p assets && \
|
||||
|
@ -128,7 +143,7 @@ Build:3.0.9.3,57
|
|||
.
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:3.0.9.0
|
||||
Current Version Code:54
|
||||
Update Check Mode:RepoManifest
|
||||
Current Version:3.3.0.2
|
||||
Current Version Code:66
|
||||
|
||||
|
|
Loading…
Reference in a new issue