[Libreoffice-commits] .: 3 commits - android/qa

[Tor Lillqvist]

 android/qa/sc/Makefile |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

New commits:
commit fb6180ddde8acd0bed788c085a09af7d744ffbad
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Dec 15 15:29:53 2011 +0200

    Add uninstall target

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 441d479..1e316b0 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -149,6 +149,9 @@ install: copy-stuff
 	@echo 'Run it with something like what "make run" does (see Makefile)'
 	@echo
 
+uninstall:
+	adb uninstall $(APP_PACKAGE)
+
 run:
 	adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector '-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' '-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/framework/util/fwk.component file:///assets/ComponentTarget/i18npool/util/i18npool.component file:///assets/ComponentTarget/sfx2/util/sfx.component file:///assets/ComponentTarget/unoxml/source/service/unoxml.component file:///assets/xml/configmgr.component file:///assets/xml/ucb1.component file:///assets/xml/ucpfile1.component' -env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" 
 
commit 537beec7f9d9dfb22c30ec6ee9b9434b42485d35
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Dec 15 15:27:49 2011 +0200

    ndk-gdb needs gdbserver and gdb.setup

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 645ee99..441d479 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -133,6 +133,12 @@ copy-stuff:
 	for F in uno_services uno_types; do \
 		sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$${F}.rdb >assets/lib/$${F}.rdb; \
 	done
+#
+# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
+#
+	cp $(NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST)
+	echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
+
 
 build-ant: copy-stuff
 	unset JAVA_HOME && ant debug
commit 0b1cff0dbd2b60485aa1fda71810e0d2c8c1d743
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Dec 15 13:32:54 2011 +0200

    ucalc needs lots more libraries

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index f01f8a6..645ee99 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -58,7 +58,15 @@ copy-stuff:
 		  avmedialo \
 		  basegfxlo \
 		  bootstrap.uno \
+		  canvastoolslo \
 		  comphelpgcc3 \
+		  cppcanvaslo \
+		  drawinglayerlo \
+		  editenglo \
+		  fontconfig \
+		  forlo \
+		  foruilo \
+		  freetype \
 		  fwelo \
 		  fwilo \
 		  gcc3_uno \
@@ -72,8 +80,10 @@ copy-stuff:
 		  icuuclo \
 		  jvmaccessgcc3 \
 		  jvmfwk \
+		  lnglo \
 		  localedata_en \
 		  localedata_others \
+		  msfilterlo \
 		  reg \
 		  saxlo \
 		  sblo \
@@ -82,6 +92,9 @@ copy-stuff:
 		  store \
 		  svllo \
 		  svtlo \
+		  svxcorelo \
+		  svxlo \
+		  test \
 		  tklo \
 		  tllo \
 		  ucbhelper4gcc3 \
@@ -90,11 +103,15 @@ copy-stuff:
 		  uno_sal \
 		  uno_salhelpergcc3 \
 		  unoexceptionprotector \
+		  unotest \
 		  utllo \
+		  vbahelperlo \
 		  vcllo \
 		  vclplug_svplo \
+		  xcrlo \
 		  xml2 \
 		  xmlreader \
+		  xolo \
 		  ); do \
 	    $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
 	done