Merge branch 'master' into 'master'

Boilr: fixed path for support-annotations lib.

See merge request !1920
This commit is contained in:
Boris Kraut 2016-12-30 23:57:50 +00:00
commit 883f7f418e

View file

@ -115,7 +115,7 @@ Build:0.7.0,9
commit=0.7.0 commit=0.7.0
maven=yes maven=yes
prebuild=$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=7.0_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-24/android.jar && \ prebuild=$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=7.0_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-24/android.jar && \
$$MVN3$$ install:install-file -DgroupId=com.android.support -DartifactId=support-annotations -Dversion=22.1.1 -Dpackaging=jar -Dfile=$$SDK$$/extras/android/support/annotations/android-support-annotations.jar $$MVN3$$ install:install-file -Dfile=$$SDK$$/extras/android/m2repository/com/android/support/support-annotations/22.1.1/support-annotations-22.1.1.jar -DpomFile=$$SDK$$/extras/android/m2repository/com/android/support/support-annotations/22.1.1/support-annotations-22.1.1.pom
Archive Policy:2 versions Archive Policy:2 versions
Auto Update Mode:Version %v Auto Update Mode:Version %v