diff --git a/Makefile b/Makefile index a6c39794a..c537f426c 100644 --- a/Makefile +++ b/Makefile @@ -180,6 +180,12 @@ ifneq (,$(wildcard make/$(TARGET).mk)) include make/$(TARGET).mk endif +android-ndk: + $(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_NDK_HOME) + +android-sdk: + $(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_HOME) + # for gettext DOMAIN=koreader TEMPLATE_DIR=l10n/templates @@ -210,4 +216,4 @@ static-check: doc: make -C doc -.PHONY: all base clean doc test +.PHONY: all android-ndk android-sdk base clean doc test diff --git a/make/android.mk b/make/android.mk index 0dcc1f394..b27cc852b 100644 --- a/make/android.mk +++ b/make/android.mk @@ -4,12 +4,6 @@ ANDROID_ASSETS = $(ANDROID_LAUNCHER_DIR)/assets/module ANDROID_LIBS_ROOT = $(ANDROID_LAUNCHER_DIR)/libs ANDROID_LIBS_ABI = $(ANDROID_LIBS_ROOT)/$(ANDROID_ABI) -android-ndk: - $(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_NDK_HOME) - -android-sdk: - $(MAKE) -C $(KOR_BASE)/toolchain $(ANDROID_HOME) - androiddev: update $(MAKE) -C $(ANDROID_LAUNCHER_DIR) dev @@ -70,4 +64,4 @@ update: all cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity.apk \ koreader-android-$(ANDROID_ARCH)$(KODEDUG_SUFFIX)-$(VERSION).apk -.PHONY: android-ndk android-sdk androiddev update +.PHONY: androiddev update