diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-10-06 14:45:55 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-11-20 14:41:51 -0600 |
| commit | 24b4610e10a539609a6679b598de7dc7957791c0 (patch) | |
| tree | da941b69e5c4af5e7f3153e2d6b7e0b3e00e83a8 /android | |
| parent | e587d0c98a5cc819df8c811e7c7347b87a3093ab (diff) | |
Separate Impress Remote from Android build.
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 <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Module_android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
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 \ )) |