From ef342aa3a11752db3dbc454b8fa04dc373a08502 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Tue, 12 Mar 2019 14:57:14 +0100 Subject: [PATCH] [ion/sdl/android] Clean the gradle invocation --- ion/src/sdl/android/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ion/src/sdl/android/Makefile b/ion/src/sdl/android/Makefile index 9e5406c94..8dec94be6 100644 --- a/ion/src/sdl/android/Makefile +++ b/ion/src/sdl/android/Makefile @@ -51,14 +51,15 @@ epsilon_apk_deps = $(patsubst %,$(BUILD_DIR)/app/libs/%/libepsilon.so,$(NDK_ABIS epsilon_apk_deps += $(subst ion/src/sdl/android/src/res,$(BUILD_DIR)/app/res,$(wildcard ion/src/sdl/android/src/res/*/*)) epsilon_apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/ic_launcher_foreground.png) -.PHONY: epsilon.apk -epsilon.apk: $(epsilon_apk_deps) +.PHONY: gradle_% +gradle_%: $(epsilon_apk_deps) @echo "GRADLE ion/src/sdl/android/build.gradle" - $(Q) ANDROID_HOME=/usr/local/android gradle -b ion/src/sdl/android/build.gradle assembleRelease + $(Q) ANDROID_HOME=/usr/local/android EPSILON_VERSION=$(EPSILON_VERSION) PATCH_LEVEL=$(PATCH_LEVEL) gradle -b ion/src/sdl/android/build.gradle $* + +.PHONY: epsilon.apk +epsilon.apk: gradle_assembleRelease .PHONY: epsilon_run -epsilon_run: $(epsilon_apk_deps) - @echo "GRADLE ion/src/sdl/android/build.gradle" - $(Q) ANDROID_HOME=/usr/local/android gradle -b ion/src/sdl/android/build.gradle installDebug +epsilon_run: gradle_installDebug endif