Browse Source

Update target in properties and scripts to match value from AndroidManifest.xml; make exception for Travis

master
Miłosz Sieradzki 10 years ago
parent
commit
f8c1506a8a
  1. 2
      project.properties
  2. 2
      setup-ant.bat
  3. 7
      setup-ant.sh

2
project.properties

@ -11,5 +11,5 @@ @@ -11,5 +11,5 @@
proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-19
target=android-20
android.library.reference.1=external/netcipher/libnetcipher

2
setup-ant.bat

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ECHO OFF
SETLOCAL enabledelayedexpansion
SET "target=android-19"
SET "target=android-20"
REM Update ant setup in project and all sub-projects
SET "pattern=project.properties"

7
setup-ant.sh

@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
#!/bin/sh
target="android-19"
target="android-20"
# Travis doesn't support android-20 yet
if [ -n "$TRAVIS" ]; then
target="android-19";
fi
# Update ant setup in project and all sub-projects
for f in `find external/ -name project.properties`; do

Loading…
Cancel
Save