summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2011-03-11 15:45:34 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2011-03-11 15:45:34 +0000
commit436411126739121244facf511ad2b4bdb0a697fd (patch)
treebd98b649a2a9134325a316a613ea0c06aad27dfe
parentfe6faf2e2c6e410f8b96ee470cf0ce21f745f56d (diff)
downloadrockbox-436411126739121244facf511ad2b4bdb0a697fd.tar.gz
rockbox-436411126739121244facf511ad2b4bdb0a697fd.zip
Android: update project to SDKv11
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29561 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--android/android.make6
-rw-r--r--android/default.properties2
2 files changed, 4 insertions, 4 deletions
diff --git a/android/android.make b/android/android.make
index 4e63658241..7b7f222b7f 100644
--- a/android/android.make
+++ b/android/android.make
@@ -22,12 +22,12 @@ BINLIB_DIR=$(BUILDDIR)/libs/armeabi
22java2class = $(addsuffix .class,$(basename $(subst $(ANDROID_DIR),$(BUILDDIR),$(1)))) 22java2class = $(addsuffix .class,$(basename $(subst $(ANDROID_DIR),$(BUILDDIR),$(1))))
23 23
24# API version 24# API version
25ANDROID_PLATFORM_VERSION=8 25ANDROID_PLATFORM_VERSION=11
26ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) 26ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION)
27 27
28# android tools 28# android tools
29AAPT=$(ANDROID_PLATFORM)/tools/aapt 29AAPT=$(ANDROID_SDK_PATH)/platform-tools/aapt
30DX=$(ANDROID_PLATFORM)/tools/dx 30DX=$(ANDROID_SDK_PATH)/platform-tools/dx
31APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder 31APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder
32ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign 32ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
33KEYSTORE=$(HOME)/.android/debug.keystore 33KEYSTORE=$(HOME)/.android/debug.keystore
diff --git a/android/default.properties b/android/default.properties
index 0b9250e021..510b0908b3 100644
--- a/android/default.properties
+++ b/android/default.properties
@@ -8,4 +8,4 @@
8# project structure. 8# project structure.
9 9
10# Project target. 10# Project target.
11target=android-8 11target=android-11