From f871b90d5e473c293eda4e2f521c6ab0a095ca8d Mon Sep 17 00:00:00 2001
From: Rodrigo Kumpera <kumpera@gmail.com>
Date: Fri, 27 Oct 2017 15:50:22 -0700
Subject: [sdks] Fix Android build.

The generated project.properties file is required by build.xml.
Fix the clean target to work on a clean tree and to remove those generated files.
---
 sdks/android/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'sdks/android')

diff --git a/sdks/android/Makefile b/sdks/android/Makefile
index 1c9114aa486..003db368939 100644
--- a/sdks/android/Makefile
+++ b/sdks/android/Makefile
@@ -8,16 +8,19 @@ NDK_BUILD = $(NDK_DIR)/ndk-build
 PACKAGE   = org.mono.android.AndroidTestRunner
 ACTIVITY  = org.mono.android.AndroidRunner
 
+PROJECT_SETUP_FILES = project.properties local.properties
+
+
 .PHONY: all
 all: setup stage-sdk
 	$(MAKE) -C managed all
 	$(NDK_BUILD)
 	$(ANT) debug
 
-local.properties:
+$(PROJECT_SETUP_FILES): build.xml AndroidManifest.xml
 	$(ANDROID) update project -p . -t "android-14"
 
-setup: local.properties
+setup: $(PROJECT_SETUP_FILES)
 
 jni/armeabi-v7a jni/arm64-v8a jni/x86 jni/x86_64 assets:
 	mkdir -p $@
@@ -42,9 +45,11 @@ assets/mconfig: machine.config assets
 stage-sdk: $(foreach lib,$(MONO_LIBS),jni/armeabi-v7a/$(lib)) $(foreach lib,$(MONO_LIBS),jni/arm64-v8a/$(lib)) \
 	$(foreach lib,$(MONO_LIBS),jni/x86/$(lib)) $(foreach lib,$(MONO_LIBS),jni/x86_64/$(lib)) assets/mconfig
 
+#This is hilarious, but we can't clean unless we got the 2 property files around
 .PHONY: clean
-clean:
+clean: $(PROJECT_SETUP_FILES)
 	$(ANT) clean
+	rm $(PROJECT_SETUP_FILES)
 
 .PHONY: deploy
 deploy: all
-- 
cgit v1.2.3