Change libraries to library projects

This commit is contained in:
Miłosz Sieradzki 2015-02-01 18:04:27 +01:00
parent ddfc5d9334
commit 382cfdbc65
6 changed files with 19 additions and 2 deletions

4
.gitignore vendored
View File

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

View File

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

Binary file not shown.

Binary file not shown.

View File

@ -12,4 +12,6 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.
# Project target. # Project target.
target=android-21 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

View File

@ -2,6 +2,16 @@
target="android-21" 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 # 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
projectdir=`dirname $f` projectdir=`dirname $f`
@ -9,4 +19,3 @@ for f in `find external/ -name project.properties`; do
android update lib-project -p $projectdir -t $target android update lib-project -p $projectdir -t $target
done done
android update project -p . --subprojects -t $target --name Lightning android update project -p . --subprojects -t $target --name Lightning