From 24b4610e10a539609a6679b598de7dc7957791c0 Mon Sep 17 00:00:00 2001 From: "Andrzej J.R. Hunt" Date: Sun, 6 Oct 2013 14:45:55 +0100 Subject: Separate Impress Remote from Android build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously the Impress Remote app could only be built within gbuild when building the entirety of LO for Android, it can now be enabled separately to be built within any LO build. (Note that the app could still be built separately without doing a full Android build of LO by using the android build tools and/or IDE.) Conflicts: config_host.mk.in Change-Id: I21d4389082a1492a3c9029d630f3fff97d9ba99a Reviewed-on: https://gerrit.libreoffice.org/6146 Reviewed-by: Björn Michaelsen Tested-by: Björn Michaelsen --- android/Module_android.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'android') diff --git a/android/Module_android.mk b/android/Module_android.mk index 46326bda5e2f..da984827160b 100644 --- a/android/Module_android.mk +++ b/android/Module_android.mk @@ -8,10 +8,17 @@ $(eval $(call gb_Module_Module,android)) -ifeq ($(OS),ANDROID) +ifeq ($(ENABLE_SDREMOTE_ANDROID),TRUE) $(eval $(call gb_Module_add_targets,android,\ CustomTarget_sdremote \ +)) + +endif + +ifeq ($(OS),ANDROID) + +$(eval $(call gb_Module_add_targets,android,\ CustomTarget_lo4android \ CustomTarget_android_desktop \ )) -- cgit