From 8740cf3b2220315cff63af652a5ef671bc6abfb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20W=C3=B6rner?= Date: Sun, 3 May 2015 16:47:20 +0200 Subject: [PATCH] clean gradle build in Android.mk --- Android.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Android.mk b/Android.mk index c6b7d1bf..690bd37d 100644 --- a/Android.mk +++ b/Android.mk @@ -24,13 +24,10 @@ gmscore_dir := $(LOCAL_PATH) gmscore_apk := play-services-core/build/outputs/apk/play-services-core-debug.apk $(LOCAL_PATH)/$(gmscore_apk): - old_java_tool_options=$(JAVA_TOOL_OPTIONS) - export JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" echo "sdk.dir=$(ANDROID_HOME)" > $(gmscore_dir)/local.properties cd $(gmscore_dir) && git submodule update --recursive --init -# cd $(gmscore_dir) && gradle assembleRelease - cd $(gmscore_dir) && gradle assembleDebug - export JAVA_TOOL_OPTIONS=$(old_java_tool_options) +# cd $(gmscore_dir) && JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" ./gradlew assembleRelease + cd $(gmscore_dir) && JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" ./gradlew assembleDebug LOCAL_CERTIFICATE := platform LOCAL_SRC_FILES := $(gmscore_apk)