Download as
Browse Code »

Commit d83952481456fdb42984c3095f9c6ad145ef9881

Authored by perry.werneck@gmail.com
1 parent 17d5af0f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Atualizando projeto android para OpenSUSE 12.2

Showing 3 changed files with 9 additions and 7 deletions   Show diff stats
android/Makefile
  Diff comments   View file @d839524
@@ -28,14 +28,16 @@ @@ -28,14 +28,16 @@
28 # http://developer.android.com/tools/building/building-cmdline.html 28 # http://developer.android.com/tools/building/building-cmdline.html
29 # 29 #
30 30
31 -JDK_HOME=/usr/java/jdk1.7.0_05 31 +JDK_HOME=/usr/java/default
32 JAVAH=$(JDK_HOME)/bin/javah 32 JAVAH=$(JDK_HOME)/bin/javah
33 JAVAC=$(JDK_HOME)/bin/javac 33 JAVAC=$(JDK_HOME)/bin/javac
34 ANT=/usr/bin/ant 34 ANT=/usr/bin/ant
35 35
36 -ANDROIDSDK=/opt/android-sdk 36 +ANDROIDSDK=/opt/android-sdk-linux
  37 +ANDROIDNDK=/opt/android-ndk-r8b
  38 +ANDROIDCLASSPATH=$(ANDROIDSDK)/platforms/android-16/android.jar
37 39
38 -NDKBUILD=/opt/android-ndk-r8/ndk-build 40 +NDKBUILD=$(ANDROIDNDK)/ndk-build
39 MKDIR=/bin/mkdir -p 41 MKDIR=/bin/mkdir -p
40 CONVERT=rsvg-convert 42 CONVERT=rsvg-convert
41 43
@@ -49,7 +51,7 @@ RESOLUTION=xhdpi mdpi ldpi hdpi @@ -49,7 +51,7 @@ RESOLUTION=xhdpi mdpi ldpi hdpi
49 bin/classes/$(CLASSPATH)/%.class: src/$(CLASSPATH)/%.java 51 bin/classes/$(CLASSPATH)/%.class: src/$(CLASSPATH)/%.java
50 @$(MKDIR) `dirname $@` 52 @$(MKDIR) `dirname $@`
51 @echo "Compile thumb : `basename $@` <= `basename $<`" 53 @echo "Compile thumb : `basename $@` <= `basename $<`"
52 - @$(JAVAC) -classpath $(ANDROIDSDK)/platforms/android-15/android.jar -d bin/classes $< 54 + @$(JAVAC) -classpath $(ANDROIDCLASSPATH) -d bin/classes $<
53 55
54 res/drawable-xhdpi/%.png: %.svg 56 res/drawable-xhdpi/%.png: %.svg
55 @echo "Gen XHDPI : `basename $@` <= `basename $<`" 57 @echo "Gen XHDPI : `basename $@` <= `basename $<`"
@@ -126,4 +128,4 @@ sigs.txt: bin/classes/$(CLASSPATH)/lib3270.class @@ -126,4 +128,4 @@ sigs.txt: bin/classes/$(CLASSPATH)/lib3270.class
126 128
127 jni/lib3270jni.h: bin/classes/$(CLASSPATH)/lib3270.class 129 jni/lib3270jni.h: bin/classes/$(CLASSPATH)/lib3270.class
128 @echo " GEN `basename $@`" 130 @echo " GEN `basename $@`"
129 - @$(JAVAH) -o $@ -classpath $(ANDROIDSDK)/platforms/android-15/android.jar:bin/classes $(subst /,.,$(CLASSPATH)).lib3270 131 + @$(JAVAH) -o $@ -classpath $(ANDROIDCLASSPATH):bin/classes $(subst /,.,$(CLASSPATH)).lib3270
android/local.properties
  Diff comments   View file @d839524
@@ -7,4 +7,4 @@ @@ -7,4 +7,4 @@
7 # location of the SDK. This is only used by Ant 7 # location of the SDK. This is only used by Ant
8 # For customization when using a Version Control System, please read the 8 # For customization when using a Version Control System, please read the
9 # header note. 9 # header note.
10 -sdk.dir=/opt/android-sdk 10 +sdk.dir=/opt/android-sdk-linux
android/project.properties
  Diff comments   View file @d839524
@@ -11,4 +11,4 @@ @@ -11,4 +11,4 @@
11 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt 11 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12 12
13 # Project target. 13 # Project target.
14 -target=android-15 14 +target=android-16