Browse Source

Change libraries to library projects

master
Miłosz Sieradzki 10 years ago
parent
commit
382cfdbc65
  1. 4
      .gitignore
  2. 2
      ant.properties
  3. BIN
      lib/android-support-v7-appcompat.jar
  4. BIN
      lib/android-support-v7-palette.jar
  5. 4
      project.properties
  6. 11
      setup-ant.sh

4
.gitignore vendored

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

2
ant.properties

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

BIN
lib/android-support-v7-appcompat.jar

Binary file not shown.

BIN
lib/android-support-v7-palette.jar

Binary file not shown.

4
project.properties

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

11
setup-ant.sh

@ -2,6 +2,16 @@ @@ -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 @@ -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

Loading…
Cancel
Save