Merge pull request #176 from kuc/fix-travis-build

Fix Travis build in dev branch

.gitignore

@@ -163,3 +163,7 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
+
+# Support libraries
+/external/appcompat
+/external/palette

ant.properties

@@ -0,0 +1,2 @@
+java.source=1.7
+java.target=1.7

project.properties

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

setup-ant.bat

@@ -1,7 +1,17 @@
 @ECHO OFF
 SETLOCAL enabledelayedexpansion
 
-SET "target=android-20"
+SET "target=android-21"
+
+RMDIR external\appcompat /s /q
+XCOPY "%ANDROID_HOME%\extras\android\support\v7\appcompat" "external\appcompat\*" /s /e /y /q
+
+REM This library is already included by netcipher, but SHA1 of JARs differ
+DEL /f /q external\appcompat\libs\android-support-v4.jar
+
+RMDIR external\palette /s /q
+XCOPY "%ANDROID_HOME%\extras\android\support\v7\palette" "external\palette\*" /s /e /y /q
+MKDIR external\palette\src
 
 REM Update ant setup in project and all sub-projects
 SET "pattern=project.properties"

setup-ant.sh

@@ -2,6 +2,16 @@
 
 target="android-21"
 
+rm -rf external/appcompat
+cp -r "${ANDROID_HOME}/extras/android/support/v7/appcompat" external/
+
+# This library is already included by netcipher, but SHA1 of JARs differ
+rm external/appcompat/libs/android-support-v4.jar
+
+rm -rf external/palette
+cp -r "${ANDROID_HOME}/extras/android/support/v7/palette" external/
+mkdir external/palette/src
+
 # Update ant setup in project and all sub-projects
 for f in `find external/ -name project.properties`; do
     projectdir=`dirname $f`
@@ -9,4 +19,3 @@ for f in `find external/ -name project.properties`; do
     android update lib-project -p $projectdir -t $target
 done
 android update project -p . --subprojects -t $target --name Lightning
-