From d83952481456fdb42984c3095f9c6ad145ef9881 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Wed, 10 Oct 2012 19:08:19 +0000 Subject: [PATCH] Atualizando projeto android para OpenSUSE 12.2 --- android/Makefile | 12 +++++++----- android/local.properties | 2 +- android/project.properties | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/android/Makefile b/android/Makefile index 2b82ece..012872d 100644 --- a/android/Makefile +++ b/android/Makefile @@ -28,14 +28,16 @@ # http://developer.android.com/tools/building/building-cmdline.html # -JDK_HOME=/usr/java/jdk1.7.0_05 +JDK_HOME=/usr/java/default JAVAH=$(JDK_HOME)/bin/javah JAVAC=$(JDK_HOME)/bin/javac ANT=/usr/bin/ant -ANDROIDSDK=/opt/android-sdk +ANDROIDSDK=/opt/android-sdk-linux +ANDROIDNDK=/opt/android-ndk-r8b +ANDROIDCLASSPATH=$(ANDROIDSDK)/platforms/android-16/android.jar -NDKBUILD=/opt/android-ndk-r8/ndk-build +NDKBUILD=$(ANDROIDNDK)/ndk-build MKDIR=/bin/mkdir -p CONVERT=rsvg-convert @@ -49,7 +51,7 @@ RESOLUTION=xhdpi mdpi ldpi hdpi bin/classes/$(CLASSPATH)/%.class: src/$(CLASSPATH)/%.java @$(MKDIR) `dirname $@` @echo "Compile thumb : `basename $@` <= `basename $<`" - @$(JAVAC) -classpath $(ANDROIDSDK)/platforms/android-15/android.jar -d bin/classes $< + @$(JAVAC) -classpath $(ANDROIDCLASSPATH) -d bin/classes $< res/drawable-xhdpi/%.png: %.svg @echo "Gen XHDPI : `basename $@` <= `basename $<`" @@ -126,4 +128,4 @@ sigs.txt: bin/classes/$(CLASSPATH)/lib3270.class jni/lib3270jni.h: bin/classes/$(CLASSPATH)/lib3270.class @echo " GEN `basename $@`" - @$(JAVAH) -o $@ -classpath $(ANDROIDSDK)/platforms/android-15/android.jar:bin/classes $(subst /,.,$(CLASSPATH)).lib3270 + @$(JAVAH) -o $@ -classpath $(ANDROIDCLASSPATH):bin/classes $(subst /,.,$(CLASSPATH)).lib3270 diff --git a/android/local.properties b/android/local.properties index 12a0114..8a752b2 100644 --- a/android/local.properties +++ b/android/local.properties @@ -7,4 +7,4 @@ # location of the SDK. This is only used by Ant # For customization when using a Version Control System, please read the # header note. -sdk.dir=/opt/android-sdk +sdk.dir=/opt/android-sdk-linux diff --git a/android/project.properties b/android/project.properties index 0840b4a..9b84a6b 100644 --- a/android/project.properties +++ b/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-15 +target=android-16 -- libgit2 0.21.2