diff options
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 | |||
28 | .PHONY: apk classes clean dex dirs libs jar | 28 | .PHONY: apk classes clean dex dirs libs jar |
29 | 29 | ||
30 | # API version | 30 | # API version |
31 | ANDROID_PLATFORM_VERSION=16 | 31 | ANDROID_PLATFORM_VERSION=19 |
32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) | 32 | ANDROID_PLATFORM=$(ANDROID_SDK_PATH)/platforms/android-$(ANDROID_PLATFORM_VERSION) |
33 | 33 | ||
34 | # android tools | 34 | # android tools |
35 | AAPT=$(ANDROID_SDK_PATH)/platform-tools/aapt | 35 | BUILD_TOOLS_VERSION=19.0.3 |
36 | DX=$(ANDROID_SDK_PATH)/platform-tools/dx | 36 | AAPT=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/aapt |
37 | APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder | 37 | DX=$(ANDROID_SDK_PATH)/build-tools/$(BUILD_TOOLS_VERSION)/dx |
38 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign | 38 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign |
39 | KEYSTORE=$(HOME)/.android/debug.keystore | 39 | KEYSTORE=$(HOME)/.android/debug.keystore |
40 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb | 40 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb |
41 | BUILDAPK=$(ANDROID_DIR)/buildapk.sh | ||
41 | 42 | ||
42 | CLASSPATH := $(BUILDDIR)/bin/classes | 43 | CLASSPATH := $(BUILDDIR)/bin/classes |
43 | 44 | ||
@@ -130,8 +131,7 @@ $(BINLIB_DIR)/lib%.so: $(RBCODEC_BLD)/codecs/%.codec | |||
130 | libs: $(DIRS) $(LIBS) | 131 | libs: $(DIRS) $(LIBS) |
131 | 132 | ||
132 | $(TEMP_APK): $(AP_) $(LIBS) $(DEX) | $(DIRS) | 133 | $(TEMP_APK): $(AP_) $(LIBS) $(DEX) | $(DIRS) |
133 | $(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(APKBUILDER) $@ \ | 134 | $(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(BUILDAPK) $(BUILDDIR) $(notdir $@) $(BUILD_TOOLS_VERSION) |
134 | -u -z $(AP_) -f $(DEX) -nf $(BUILDDIR)/libs | ||
135 | 135 | ||
136 | $(KEYSTORE): | 136 | $(KEYSTORE): |
137 | $(SILENT)mkdir -p $(HOME)/.android | 137 | $(SILENT)mkdir -p $(HOME)/.android |