Don't create the local.properties files in the source tree from configure

Change-Id: Ic87be0146360c5e32f1f12f255c897e051c9a50c

7 files changed, 20 insertions, 16 deletions

diff --git a/android/Bootstrap/local.properties.in b/android/Bootstrap/local.properties.in
deleted file mode 100644
index 27c8eb5f4dac..000000000000
--- a/android/Bootstrap/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index cf4ac486fe62..63fefa73b88c 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -32,6 +32,10 @@ endef
 
 all: build-ant
 
+properties:
+	echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
+	echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties 
+
 copy-stuff: 
 # First always clean 
 	rm -rf libs $(OBJLOCAL)
@@ -230,7 +234,7 @@ copy-stuff:
 	cp $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST)
 	echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
 
-build-ant: copy-stuff
+build-ant: copy-stuff properties
 #
 # Copy jar files we need, and even construct one.
 #
@@ -259,6 +263,6 @@ uninstall:
 run:
 	adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt:/assets/border.xls:/assets/test.odt:/assets/testVba.doc
 
-clean:
+clean: properties
 	$(ANT) clean
 	rm -rf assets libs $(SODEST) $(OBJLOCAL)
diff --git a/android/experimental/DocumentLoader/local.properties.in b/android/experimental/DocumentLoader/local.properties.in
deleted file mode 100644
index 27c8eb5f4dac..000000000000
--- a/android/experimental/DocumentLoader/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 490a7a8b55db..7a15bf581a52 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -26,6 +26,10 @@ endef
 
 all: build-ant
 
+properties:
+	echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
+	echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties 
+
 buildrcs:
 # main sofficerc ini ...
 	mkdir -p assets/program/
@@ -229,10 +233,10 @@ copy-stuff: buildrcs
 	echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
 
 
-build-ant: copy-stuff
+build-ant: copy-stuff properties
 	unset JAVA_HOME && $(ANT) debug
 
-install: copy-stuff
+install: copy-stuff properties
 	$(ANDROID_SDK_HOME)/platform-tools/adb shell rm -r $(APP_DATA_PATH)
 	unset JAVA_HOME && $(ANT) debug install
 	@echo
@@ -254,7 +258,7 @@ run:
 stop-start-cycle:
 	$(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10
 
-clean:
+clean: properties
 	$(ANT) clean
 	rm -rf assets $(SODEST) $(OBJLOCAL)
 
diff --git a/android/qa/desktop/local.properties.in b/android/qa/desktop/local.properties.in
deleted file mode 100644
index 27c8eb5f4dac..000000000000
--- a/android/qa/desktop/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index c39adcf378b6..078c9e2cb5f2 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -23,6 +23,10 @@ endef
 
 all: build-ant
 
+properties:
+	echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
+	echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties 
+
 copy-stuff:
 #
 # Copy shared libraries we need to libs/armeabi-v7a so that ant will
@@ -157,10 +161,10 @@ copy-stuff:
 	echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
 
 
-build-ant: copy-stuff
+build-ant: copy-stuff properties
 	unset JAVA_HOME && $(ANT) debug
 
-install: copy-stuff
+install: copy-stuff properties
 	unset JAVA_HOME && $(ANT) debug install
 	@echo
 	@echo 'Run it with "make run"'
@@ -191,7 +195,7 @@ stop-start-cycle:
 redirect-stdio:
 	$(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell setprop log.redirect-stdio true && $(ANDROID_SDK_HOME)/platform-tools/adb shell start
 
-clean:
+clean: properties
 	$(ANT) clean
 	rm -rf assets $(SODEST) $(OBJLOCAL)
 
diff --git a/android/qa/sc/local.properties.in b/android/qa/sc/local.properties.in
deleted file mode 100644
index 27c8eb5f4dac..000000000000
--- a/android/qa/sc/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@