diff options
| author | Mike Beattie <mike@ethernal.org> | 2012-08-02 21:16:54 +1200 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2012-08-02 21:16:54 +1200 |
| commit | 599e28b2242c79bdd0960ef16e580e51a2fa3795 (patch) | |
| tree | 3c018959788861e31afbe54399d3ebf930646fa1 | |
| parent | 59588ba34159b27c02e1a886b46497ecfa0cf4d3 (diff) | |
Re-work external lib support for newer Android SDK
* Remove older *.properties methods of locating lib dir
* clean up Eclipse classpath file
* adjust Makefile.am to link AltosLib.jar into libs/
Signed-off-by: Mike Beattie <mike@ethernal.org>
| -rw-r--r-- | altosdroid/.classpath | 4 | ||||
| -rw-r--r-- | altosdroid/.gitignore | 1 | ||||
| -rw-r--r-- | altosdroid/Makefile.am | 13 | ||||
| -rw-r--r-- | altosdroid/build.properties | 1 | ||||
| -rw-r--r-- | altosdroid/libs/.gitignore | 1 | ||||
| -rw-r--r-- | altosdroid/local.properties.in | 1 |
6 files changed, 11 insertions, 10 deletions
diff --git a/altosdroid/.classpath b/altosdroid/.classpath index d260cafa..0ca188f9 100644 --- a/altosdroid/.classpath +++ b/altosdroid/.classpath @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> - <classpathentry kind="lib" path="lib/AltosLib.jar"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> - <classpathentry kind="output" path="bin"/> + <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> + <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore index 44f249ee..c0bb8dd4 100644 --- a/altosdroid/.gitignore +++ b/altosdroid/.gitignore @@ -1,4 +1,3 @@ local.properties bin gen -local.properties diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index 0732087b..6ee984c2 100644 --- a/altosdroid/Makefile.am +++ b/altosdroid/Makefile.am @@ -15,6 +15,11 @@ APKBUILDER=$(SDK)/tools/apkbuilder ZIPALIGN=$(SDK)/tools/zipalign SRC_DIR=src/org/altusmetrum/AltosDroid +EXT_LIBDIR=libs +ALTOSLIB_SRCDIR=../altoslib +ALTOSLIB_JAR=AltosLib.jar + +ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR) SRC=\ $(SRC_DIR)/AltosDroid.java \ @@ -25,11 +30,9 @@ SRC=\ all: $(all_target) -ALTOSLIB=bin/classes/AltosLib.jar - -$(ALTOSLIB): - mkdir -p bin/classes - cd bin/classes && ln -s ../../../altoslib/AltosLib.jar . +$(ALTOSLIB): $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) + mkdir -p $(EXT_LIBDIR) + cd $(EXT_LIBDIR) && ln -s $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) . if ANDROID install-release: bin/AltosDroid-release.apk diff --git a/altosdroid/build.properties b/altosdroid/build.properties deleted file mode 100644 index 63d080cc..00000000 --- a/altosdroid/build.properties +++ /dev/null @@ -1 +0,0 @@ -jar.libs.dir=../altoslib
\ No newline at end of file diff --git a/altosdroid/libs/.gitignore b/altosdroid/libs/.gitignore new file mode 100644 index 00000000..b4e68f63 --- /dev/null +++ b/altosdroid/libs/.gitignore @@ -0,0 +1 @@ +AltosLib.jar diff --git a/altosdroid/local.properties.in b/altosdroid/local.properties.in index 543ce208..14df0494 100644 --- a/altosdroid/local.properties.in +++ b/altosdroid/local.properties.in @@ -8,4 +8,3 @@ # For customization when using a Version Control System, please read the # header note. sdk.dir=@ANDROID_SDK@ -extensible.libs.classpath=../altoslib |