From a81802188eb54670b838386dbad88e23d523d6be Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Tue, 17 Jan 2017 18:00:03 -0500
Subject: [PATCH] Fix build tools

Change-Id: I6600bf9bd000ae0c6d900613e487776ddd383527
---
 Android.mk   | 4 ++--
 build.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 50889ae..5193277 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,14 +21,14 @@ LOCAL_PACKAGE_NAME := GsfProxy
 
 gsfproxy_root  := $(LOCAL_PATH)
 gsfproxy_dir   := services-framework-proxy
-gsfproxy_out   := $(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
+gsfproxy_out   := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
 gsfproxy_build := $(gsfproxy_root)/$(gsfproxy_dir)/build
 gsfproxy_apk   := build/outputs/apk/services-framework-proxy-release-unsigned.apk
 
 $(gsfproxy_root)/$(gsfproxy_dir)/$(gsfproxy_apk):
 	rm -Rf $(gsfproxy_build)
 	mkdir -p $(gsfproxy_out)
-	ln -s $(gsfproxy_out) $(gsfproxy_build)
+	ln -sf $(gsfproxy_out) $(gsfproxy_build)
 	echo "sdk.dir=$(ANDROID_HOME)" > $(gsfproxy_root)/local.properties
 	cd $(gsfproxy_root) && git submodule update --recursive --init
 	cd $(gsfproxy_root)/$(gsfproxy_dir) && JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" ../gradlew assembleRelease
diff --git a/build.gradle b/build.gradle
index 3ec4bfc..8a7d2e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "24.0.3"
+    ext.androidBuildVersionTools = "25.0.1"
     ext.isReleaseVersion = false
 }
 
-- 
2.9.3