fix android build in separate dir

Change-Id: Id7cf80e1da87a56dee645dc01e64dedc4a8586ab

8 files changed, 12 insertions, 12 deletions

diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk
index bc62a338e6c7..185f9ac16f06 100644
--- a/android/CustomTarget_android_desktop.mk
+++ b/android/CustomTarget_android_desktop.mk
@@ -24,8 +24,8 @@ $(call gb_CustomTarget_get_target,android/desktop) : \
 $(android_desktop_DIR)/done : $(lo4android_DIR)/done
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
 	cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all
-	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
-	cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+	mkdir -p $(WORKDIR)/installation/bin
+	cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(WORKDIR)/installation/bin
 
 $(call gb_CustomTarget_get_clean_target,android/desktop) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk
index c30699e4bc08..523a493d20e7 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -23,8 +23,8 @@ $(call gb_CustomTarget_get_target,android/docloader) : \
 $(docloader_DIR)/done : $(sdremote_DIR)/done
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
 	cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all
-	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
-	cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+	mkdir -p $(WORKDIR)/installation/bin
+	cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(WORKDIR)/installation/bin
 
 $(call gb_CustomTarget_get_clean_target,android/docloader) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk
index 461067a8750c..30d0e1151e6a 100644
--- a/android/CustomTarget_lo4android.mk
+++ b/android/CustomTarget_lo4android.mk
@@ -24,8 +24,8 @@ $(call gb_CustomTarget_get_target,android/lo4android) : \
 $(lo4android_DIR)/done : $(docloader_DIR)/done
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
 	cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all
-	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
-	cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+	mkdir -p $(WORKDIR)/installation/bin
+	cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(WORKDIR)/installation/bin
 
 $(call gb_CustomTarget_get_clean_target,android/lo4android) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index 69a572a7d285..79f980a81edb 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -15,8 +15,8 @@ $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
 $(sdremote_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
 	cd $(SRCDIR)/android/sdremote && $(MAKE) all
-	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
-	cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+	mkdir -p $(WORKDIR)/installation/bin
+	cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(WORKDIR)/installation/bin
 
 $(call gb_CustomTarget_get_clean_target,android/sdremote) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 136f2010989b..4f738c295f8d 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -1,4 +1,4 @@
-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
 
 # The default target just builds.
 all: build-ant
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index d33bcae6a3cb..f932235e2579 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -1,4 +1,4 @@
-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
 
 # The default target just builds.
 
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index d4b79454e0c1..eb4b029e70be 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -1,4 +1,4 @@
-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
 
 # The default target just builds.
 all: build-ant
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 49fad9219b3b..eb78e0de6d02 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -6,7 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include ../../config_host.mk
+include $(BUILDDIR)/config_host.mk
 
 all: properties translations.done
 	mkdir -p ../abs-lib/libs