More fixes to OsmAnd srclibs

This commit is contained in:
Daniel Martí 2014-02-09 14:58:45 +01:00
parent 02a8cf9ed2
commit 25f87052b5
2 changed files with 26 additions and 14 deletions

View file

@ -106,17 +106,17 @@ Build:1.5-MIPS,143
forcevercode=yes forcevercode=yes
rm=SherlockBar/build.xml rm=SherlockBar/build.xml
extlibs=perms-osmand_145.diff extlibs=perms-osmand_145.diff
srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;resources@836be71481 srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
patch=remove_analytics_android_145.diff patch=remove_analytics_android_145.diff
prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ prebuild=rm ../../OsmAnd-core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
$$SDK$$/tools/android update project -p ../SherlockBar && \ $$SDK$$/tools/android update project -p ../SherlockBar && \
sed -i 's/app_version">[^<]*/app_version">1.5-MIPS/' res/values/no_translate.xml && \ sed -i 's/app_version">[^<]*/app_version">1.5-MIPS/' res/values/no_translate.xml && \
sed -i '/keys/d' ant.properties && \ sed -i '/keys/d' ant.properties && \
cd ../../core/ && \ cd ../../OsmAnd-core/ && \
git apply ../android/OsmAnd/libs/perms-osmand_145.diff git apply ../android/OsmAnd/libs/perms-osmand_145.diff
build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \
ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
ant build -f ../OsmAnd-java/build.xml ant build -f ../OsmAnd-java/build.xml
buildjni=no buildjni=no
@ -127,17 +127,17 @@ Build:1.5-X86,144
forcevercode=yes forcevercode=yes
rm=SherlockBar/build.xml rm=SherlockBar/build.xml
extlibs=perms-osmand_145.diff extlibs=perms-osmand_145.diff
srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;resources@836be71481 srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
patch=remove_analytics_android_145.diff patch=remove_analytics_android_145.diff
prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ prebuild=rm ../../OsmAnd-core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
$$SDK$$/tools/android update project -p ../SherlockBar && \ $$SDK$$/tools/android update project -p ../SherlockBar && \
sed -i 's/app_version">[^<]*/app_version">1.5-X86/' res/values/no_translate.xml && \ sed -i 's/app_version">[^<]*/app_version">1.5-X86/' res/values/no_translate.xml && \
sed -i '/keys/d' ant.properties && \ sed -i '/keys/d' ant.properties && \
cd ../../core/ && \ cd ../../OsmAnd-core/ && \
git apply ../android/OsmAnd/libs/perms-osmand_145.diff git apply ../android/OsmAnd/libs/perms-osmand_145.diff
build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \
ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
ant build -f ../OsmAnd-java/build.xml ant build -f ../OsmAnd-java/build.xml
buildjni=no buildjni=no
@ -148,18 +148,30 @@ Build:1.5-ARM,145
forcevercode=yes forcevercode=yes
rm=SherlockBar/build.xml rm=SherlockBar/build.xml
extlibs=perms-osmand_145.diff;osmand-zlib-url_145.patch extlibs=perms-osmand_145.diff;osmand-zlib-url_145.patch
srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;resources@836be71481 srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
patch=remove_analytics_android_145.diff patch=remove_analytics_android_145.diff
prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ prebuild=rm ../../OsmAnd-core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
$$SDK$$/tools/android update project -p ../SherlockBar && \ $$SDK$$/tools/android update project -p ../SherlockBar && \
sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' res/values/no_translate.xml && \ sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' res/values/no_translate.xml && \
sed -i '/keys/d' ant.properties && \ sed -i '/keys/d' ant.properties && \
cd ../../core/ && \ cd ../../OsmAnd-core/ && \
git apply ../android/OsmAnd/libs/perms-osmand_145.diff && \ git apply ../android/OsmAnd/libs/perms-osmand_145.diff && \
git apply ../android/OsmAnd/libs/osmand-zlib-url_145.patch git apply ../android/OsmAnd/libs/osmand-zlib-url_145.patch
build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \
ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
ant build -f ../OsmAnd-java/build.xml
buildjni=no
Build:1.6.5,170
commit=f261ae846932c5f
subdir=OsmAnd
encoding=utf-8
forcevercode=yes
srclibs=OsmAnd-tools@bfee93a8d;OsmAnd-core@r1.1.4;OsmAnd-resources@836be71481
prebuild=sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml
build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \
ant jar native-libs -f $$OsmAnd-tools$$/OsmAndMapCreator/build.xml && \
ant build -f ../OsmAnd-java/build.xml ant build -f ../OsmAnd-java/build.xml
buildjni=no buildjni=no