Update target in properties and scripts to match value from AndroidManifest.xml; make exception for Travis
This commit is contained in:
parent
c03acc0f44
commit
f8c1506a8a
@ -11,5 +11,5 @@
|
|||||||
proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||||
|
|
||||||
# Project target.
|
# Project target.
|
||||||
target=android-19
|
target=android-20
|
||||||
android.library.reference.1=external/netcipher/libnetcipher
|
android.library.reference.1=external/netcipher/libnetcipher
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
@ECHO OFF
|
@ECHO OFF
|
||||||
SETLOCAL enabledelayedexpansion
|
SETLOCAL enabledelayedexpansion
|
||||||
|
|
||||||
SET "target=android-19"
|
SET "target=android-20"
|
||||||
|
|
||||||
REM Update ant setup in project and all sub-projects
|
REM Update ant setup in project and all sub-projects
|
||||||
SET "pattern=project.properties"
|
SET "pattern=project.properties"
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/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
|
# Update ant setup in project and all sub-projects
|
||||||
for f in `find external/ -name project.properties`; do
|
for f in `find external/ -name project.properties`; do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user