android/qa/sc/AndroidManifest.xml | 2 +-
android/qa/sc/Makefile | 12 ++++++++++--
unotest/source/cpp/bootstrapfixturebase.cxx | 5 +++++
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 86cd55a24950263dce62a74a6829238bf035c42e
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Mon Dec 19 01:25:41 2011 +0200
Use / as SRC_ROOT and OUTDIR_FOR_BUILD on Android
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx
b/unotest/source/cpp/bootstrapfixturebase.cxx
index 4ae52cd..ca04b30 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -46,6 +46,7 @@ using namespace ::com::sun::star;
test::BootstrapFixtureBase::BootstrapFixtureBase()
: m_aSrcRootURL(RTL_CONSTASCII_USTRINGPARAM("file://")), m_aSolverRootURL(
m_aSrcRootURL )
{
+#ifndef ANDROID
const char* pSrcRoot = getenv( "SRC_ROOT" );
CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != NULL
&& pSrcRoot[0] != 0);
const char* pSolverRoot = getenv( "OUTDIR_FOR_BUILD" );
@@ -56,6 +57,10 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
if (pSolverRoot[1] == ':')
m_aSolverRootURL += rtl::OUString::createFromAscii( "/" );
#endif
+#else
+ const char* pSrcRoot = "/";
+ const char* pSolverRoot = "/";
+#endif
m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot );
m_aSrcRootURL += m_aSrcRootPath;
commit 0f65dbcf9ac808a089793031b26893b74c138c0b
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Mon Dec 19 01:03:44 2011 +0200
More shlibs and .component files needed
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 1e316b0..582784d 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -60,6 +60,7 @@ copy-stuff:
bootstrap.uno \
canvastoolslo \
comphelpgcc3 \
+ configmgr.uno \
cppcanvaslo \
drawinglayerlo \
editenglo \
@@ -69,6 +70,7 @@ copy-stuff:
freetype \
fwelo \
fwilo \
+ fwklo \
gcc3_uno \
i18nisolang1gcc3 \
i18npaperlo \
@@ -97,13 +99,16 @@ copy-stuff:
test \
tklo \
tllo \
+ ucb1 \
ucbhelper4gcc3 \
+ ucpfile1 \
uno_cppu \
uno_cppuhelpergcc3 \
uno_sal \
uno_salhelpergcc3 \
unoexceptionprotector \
unotest \
+ unoxmllo \
utllo \
vbahelperlo \
vcllo \
@@ -125,10 +130,13 @@ copy-stuff:
cp $(OUTDIR)/bin/udkapi.rdb assets/bin
cp $(OUTDIR)/bin/types.rdb assets/bin
cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
- for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
unoxml/source/service/unoxml; do \
+ for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
unoxml/source/service/unoxml configmgr/source/configmgr; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
cp $(WORKDIR)/ComponentTarget/$$F.component
assets/ComponentTarget/`dirname $$F`; \
done
+ for F in ucb1 ucpfile1; do \
+ cp $(OUTDIR)/xml/$$F.component assets/xml; \
+ done
cp -R $(OUTDIR)/xml/registry assets/xml
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; \
@@ -153,7 +161,7 @@ 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"
+ 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/ComponentTarget/configmgr/source/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"
clean:
ant clean
commit a2401b6c750ac21792f6b5d54b45cb065f772a49
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Sun Dec 18 22:55:16 2011 +0200
This is for Calc unit tests
diff --git a/android/qa/sc/AndroidManifest.xml
b/android/qa/sc/AndroidManifest.xml
index 49c9cb7..92b374e 100644
--- a/android/qa/sc/AndroidManifest.xml
+++ b/android/qa/sc/AndroidManifest.xml
@@ -9,7 +9,7 @@
android:debuggable="true">
<!-- Bootstrap is the subclass of android.app.NativeActivity -->
<activity android:name="org.libreoffice.android.Bootstrap"
- android:label="LO simple cppunittests"
+ android:label="LO Calc unit tests"
android:configChanges="orientation|keyboardHidden">
<!-- Tell NativeActivity the name of our .so -->
<meta-data android:name="android.app.lib_name"
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
