From fbc5ea49609b7719a9399541d6a9525910478961 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 18 Dec 2016 16:54:51 -0500
Subject: [PATCH] Build fixes

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

diff --git a/Android.mk b/Android.mk
index 2102bd1..9cc8e60 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,14 +21,14 @@ LOCAL_PACKAGE_NAME := FakeStore
 
 fakestore_root  := $(LOCAL_PATH)
 fakestore_dir   := fake-store
-fakestore_out   := $(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
+fakestore_out   := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
 fakestore_build := $(fakestore_root)/$(fakestore_dir)/build
 fakestore_apk   := build/outputs/apk/fake-store-release-unsigned.apk
 
 $(fakestore_root)/$(fakestore_dir)/$(fakestore_apk):
 	rm -Rf $(fakestore_build)
 	mkdir -p $(fakestore_out)
-	ln -s $(fakestore_out) $(fakestore_build)
+	ln -sf $(fakestore_out) $(fakestore_build)
 	echo "sdk.dir=$(ANDROID_HOME)" > $(fakestore_root)/local.properties
 	cd $(fakestore_root) && git submodule update --recursive --init
 	cd $(fakestore_root)/$(fakestore_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

