Makefile.top | 3 +++
android/prj/build.lst | 2 +-
postprocess/prj/build.lst | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9d73597289be9049e8300ff92980fdffbe4d7040
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Aug 22 18:32:05 2012 +0200
another build integrating solution for android
..since it also needs stuff from postprocess.
In qa/desktop/Makefile, images_tango.zip is used.
If that's not needed, the module can be placed between postprocess
and packimages for now.
Change-Id: I9951cce0c8da0fc75fd8a7b1246f4083bd38f705
diff --git a/Makefile.top b/Makefile.top
index 979671f..54fa900 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -406,6 +406,9 @@ else
cd instsetoo_native && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
endif
+ifeq ($(OS),ANDROID)
+ cd android && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
+endif
cross-toolset: bootstrap fetch
cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
diff --git a/android/prj/build.lst b/android/prj/build.lst
index bac6f27..1a0c8c2 100644
--- a/android/prj/build.lst
+++ b/android/prj/build.lst
@@ -1,2 +1,2 @@
-an android :: tail_build NULL
+an android :: packimages postprocess NULL
an android\prj nmake - all an_prj NULL
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 51a8035..819a19c 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc
DESKTOP:setup_native STLPORT:stlport sysui tail_build android NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc
DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
po postprocess usr1 - all
po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig
po_checkxml NULL
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
