Merge branch 'OSMonitor' into 'master'
Update OS Monitor See merge request !235
This commit is contained in:
commit
53d1850262
|
@ -142,6 +142,21 @@ Build:3.3.0.3,67
|
||||||
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
|
||||||
|
|
||||||
|
Build:3.3.0.5,69
|
||||||
|
commit=b8c3b6b2878d783833571a176b045e0ab293ef25
|
||||||
|
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 && \
|
||||||
|
mv libs/armeabi/osmcore assets/osmcore_arm && \
|
||||||
|
mv libs/mips/osmcore assets/osmcore_mips && \
|
||||||
|
mv libs/x86/osmcore assets/osmcore_x86
|
||||||
|
|
||||||
Maintainer Notes:
|
Maintainer Notes:
|
||||||
Could support additional CPU architectures and lose the scanignore by building
|
Could support additional CPU architectures and lose the scanignore by building
|
||||||
the stuff in /jni and moving the three outputs to /assets.
|
the stuff in /jni and moving the three outputs to /assets.
|
||||||
|
|
Loading…
Reference in a new issue