fix android build in separate dir

Change-Id: Id7cf80e1da87a56dee645dc01e64dedc4a8586ab

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)

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)

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)

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)

android/experimental/DocumentLoader/Makefile

-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
 
 # The default target just builds.
 all: build-ant

android/experimental/LibreOffice4Android/Makefile

-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
 
 # The default target just builds.
 

android/experimental/desktop/Makefile

-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
 
 # The default target just builds.
 all: build-ant

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