diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2014-03-09 18:08:06 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2014-03-09 18:11:35 +0100 |
| commit | 6499ce3e445e1acc5f5707fd164ad5e3c5ab0a43 (patch) | |
| tree | 3e1cb19678e5ce9bfd5681d944193ede902805b6 /android/android.make | |
| parent | 2a71c0853304b68835fcf87d2bae8295d64abd6c (diff) | |
| download | rockbox-6499ce3e445e1acc5f5707fd164ad5e3c5ab0a43.tar.gz rockbox-6499ce3e445e1acc5f5707fd164ad5e3c5ab0a43.zip | |
android: Get the port up and running again
The build system needed fixes because the tools paths changed and one tool that
we used (apkbuilder) was removed entirely. Recent NDKs don't ship gcc 4.4.3
anymore, therefore switch to 4.6. The code itself needed a fix for a jni
reference bug that was uncovered by KitKat.
The port now builds with latest sdk (r22) and ndk (r9d).
Change-Id: Id74fa54ba93bbb0ee30373fbe79e92c5ff03201d
Diffstat (limited to 'android/android.make')
| -rw-r--r-- | android/android.make | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/android/android.make b/android/android.make index 6d10121952..4c93aa72cc 100644 --- a/android/android.make +++ b/android/android.make @@ -28,16 +28,17 @@ $(CPUFEAT_BUILD)/cpu-features.o: $(CPUFEAT)/cpu-features.c .PHONY: apk classes clean dex dirs libs jar # API version -ANDROID_PLATFORM_VERSION=16 +ANDROID_PLATFORM_VERSION=19 ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) # android tools -AAPT=$(ANDROID_SDK_PATH)/platform-tools/aapt -DX=$(ANDROID_SDK_PATH)/platform-tools/dx -APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder +BUILD_TOOLS_VERSION=19.0.3 +AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt +DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign KEYSTORE=$(HOME)/.android/debug.keystore ADB=$(ANDROID_SDK_PATH)/platform-tools/adb +BUILDAPK=$(ANDROID_DIR)/buildapk.sh CLASSPATH := $(BUILDDIR)/bin/classes @@ -130,8 +131,7 @@ $(BINLIB_DIR)/lib%.so: $(RBCODEC_BLD)/codecs/%.codec libs: $(DIRS) $(LIBS) $(TEMP_APK): $(AP_) $(LIBS) $(DEX) | $(DIRS) - $(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(APKBUILDER) $@ \ - -u -z $(AP_) -f $(DEX) -nf $(BUILDDIR)/libs + $(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(BUILDAPK) $(BUILDDIR) $(notdir $@) $(BUILD_TOOLS_VERSION) $(KEYSTORE): $(SILENT)mkdir -p $(HOME)/.android |