Include more stuff in the .apk needed by test_i18npool_test_breakiterator

Now it runs until a crash caused by ICU library mixup between our ones
and the system ones, they have the same names but aren't
compatible... (see 7ee03666d7cfc27453315e1682e3c32d39a031b6).

sal/osl/android/Makefile

@@ -43,11 +43,11 @@ ndk-build:
 # and ones from other modules. Note that depending on when you try
 # this, these might not have been built yet.
 #
-	-for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
+	for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
 	    $(call CONDCOPY,$${F},`basename $${F}`); \
 	done
 #
-	-for F in i18npool_test_breakiterator; do \
+	for F in i18npool_test_breakiterator; do \
 	    $(call CONDCOPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
 	done
 
@@ -57,28 +57,45 @@ ndk-build:
 #
 # Libs and UNO components that the tests from other modules need.
 #
-	-for F in gcc3_uno \
+	for F in $(strip \
+		  comphelpgcc3 \
+		  gcc3_uno \
+		  i18nisolang1gcc3 \
+		  i18nutilgcc3 \
+		  icudata \
+		  icui18n \
+		  icuuc \
 		  reg \
 		  store \
+		  ucbhelper4gcc3 \
 		  uno_cppu \
 		  uno_salhelpergcc3 \
 	          uno_cppuhelpergcc3 \
 		  unoexceptionprotector \
 		  xml2 \
 		  xmlreader \
-		  bootstrap.uno; do \
+		  bootstrap.uno \
+		  i18npool.uno); do \
 	    $(call CONDCOPY,$(OUTDIR)/lib/lib$${F}.so); \
 	done
 #
 # Then the shared GNU C++ library
 	$(call COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+#
+# Then other "assets". Let the directory structure under assets mimic
+# that under solver for now.
+	mkdir -p assets/bin assets/xml/ure assets/ComponentTarget/i18npool/util
+	cp $(OUTDIR)/bin/udkapi.rdb assets/bin
+	cp $(OUTDIR)/bin/types.rdb assets/bin
+	cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
+	cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
 
 install: ndk-build
 	unset JAVA_HOME && ant debug install
 
 run: install
-# Note: this is of course just an example. The full path the the test
-# .so needs to be supplied, unfortunately, I guess cppunittester
-# checks its existance using the pathname instead of just
-# osl_loadModule'ing it.
-	adb shell am start -n org.libreoffice.android/.Bootstrap -e lo-main-library libcppunittester -e lo-main-cmdline "/data/data/org.libreoffice.android/lib/libqa_sal_types.so"
+# Note: these are just examples. The full path the the app's directory
+# needs to be supplied in a couple of places, unfortunately.
+
+#	adb shell am start -n org.libreoffice.android/.Bootstrap -e lo-main-library libcppunittester -e lo-main-cmdline "/data/data/org.libreoffice.android/lib/libqa_sal_types.so"
+#	adb shell am start -n org.libreoffice.android/.Bootstrap -e lo-main-library libcppunittester -e lo-main-cmdline "/data/data/org.libreoffice.android/lib/libtest_i18npool_test_breakiterator.so --protector libunoexceptionprotector.so unoexceptionprotector '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  file:///assets/ComponentTarget/i18npool/util/i18npool.component' -env:LO_LIB_DIR=file:///data/data/org.libreoffice.android/lib"