[Libreoffice-commits] .: Branch 'feature/android' - android/qa

[Michael Meeks]

 android/qa/desktop/Makefile |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit c94c9dbdcfc8435f0df61fd326dc25d39d3c44cb
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jan 31 22:24:08 2012 +0000

    android: package missing libraries, and shell branding - we get a shell.

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 3475248..553aefe 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -113,10 +113,9 @@ copy-stuff: buildrcs
 		  comphelpgcc3 \
 		  configmgr.uno \
 		  cppcanvaslo \
-		  deployment \
-		  deploymentmisclo \
 		  drawinglayerlo \
 		  editenglo \
+		  expwrap.uno \
 		  fileacc \
 		  fontconfig \
 		  forlo \
@@ -125,6 +124,7 @@ copy-stuff: buildrcs
 		  fwelo \
 		  fwilo \
 		  fwklo \
+		  fsstorage.uno \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
 		  i18npaperlo \
@@ -187,6 +187,9 @@ copy-stuff: buildrcs
 		  ); do \
 	    $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
 	done
+#		  deployment \
+#		  deploymentmisclo \
+
 #
 # Then the shared GNU C++ library
 	$(call COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
@@ -218,6 +221,8 @@ copy-stuff: buildrcs
 		mkdir -p assets/presets/$$D ; \
 		echo "content" > assets/presets/$$D/stamp; \
 	done
+# shell / splash images
+	cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program
 # Then assets that are unpacked at run-time into the app's data directory.
 	mkdir -p assets/unpack/etc/fonts
 	cp fonts.conf assets/unpack/etc/fonts