diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-09-12 10:40:59 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2014-09-18 20:52:01 +0000 |
| commit | 71832a527a936bbb8e76154cbd3ffc491ea31b58 (patch) | |
| tree | 66d582cbf1e193c0f4791f5b45393e50059006c6 /android/Module_android.mk | |
| parent | $(GNUMAKE) is not used outside of a configure (diff) | |
| download | core-71832a527a936bbb8e76154cbd3ffc491ea31b58.tar.gz core-71832a527a936bbb8e76154cbd3ffc491ea31b58.zip | |
Android: merge LibreOffice4Android into LOAndroid3
This commit merges the code of the document browser found in
android/experimental/LibreOffice4Android into the new document viewer
at LOAndroid3. All the source and resources is moved, and some
duplicated files are removed.
From now on the apk generated by LOAndroid3 will provide the document
browser too.
Slightly modified the build files of ExperimentalDesktop project
because they depended on LibreOffice4Android being built.
Change-Id: I0579afda7b570509ca4d3873c28a13fcbeeb5ab8
Reviewed-on: https://gerrit.libreoffice.org/11487
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'android/Module_android.mk')
| -rw-r--r-- | android/Module_android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/android/Module_android.mk b/android/Module_android.mk index eedc57aa15ba..4b8485a223e3 100644 --- a/android/Module_android.mk +++ b/android/Module_android.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,android)) ifeq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,android,\ - CustomTarget_lo4android \ CustomTarget_lo_android \ CustomTarget_android_desktop \ )) |