[Libreoffice-commits] .: 5 commits - bridges/inc bridges/source icu/makefile.mk sal/osl
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Nov 21 08:22:11 PST 2011
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 3 -
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 8 +++
icu/makefile.mk | 2
sal/osl/android/Makefile | 41 ++++++++++++-------
4 files changed, 38 insertions(+), 16 deletions(-)
New commits:
commit 7a357d93d8bc7cc47b6352546a47973379f513e4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 21 18:17:10 2011 +0200
Add stuff to run bridgetest
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index e7d6c67..660126c 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -1,3 +1,8 @@
+# The full path the the app's directory needs to be supplied in a
+# couple of places, unfortunately.
+
+APP_DATA_PATH=/data/data/org.libreoffice.android
+
NDK_HOME:=$(shell type -p ndk-build)
NDK_HOME:=$(shell dirname $(NDK_HOME))
@@ -80,20 +85,32 @@ ndk-build:
# Then the shared GNU C++ library
$(call COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
#
+# bridgetest components, not in solver
+ for F in bridgetest constructors cppobj; do \
+ $(call COPY,$(SRC_ROOT)/testtools/$(INPATH)/lib/lib$${F}.uno.so); \
+ done
+#
# 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
+ mkdir -p assets/bin assets/lib 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
+ 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
install: ndk-build
unset JAVA_HOME && ant debug install
run: install
-# 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"
+# Note: these are just examples.
+#
+# The first two ones should work
+ adb shell am start -n org.libreoffice.android/.Bootstrap -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libqa_sal_types.so"
+#
+ adb shell am start -n org.libreoffice.android/.Bootstrap -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/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://$(APP_DATA_PATH)/lib"
+#
+# This doesn't work yet
+ adb shell am start -n org.libreoffice.android/.Bootstrap -e lo-main-library libunoexe -e lo-main-cmdline "-ro /assets/lib/uno_services.rdb -ro /assets/lib/uno_types.rdb -s com.sun.star.test.bridge.BridgeTest -- com.sun.star.test.bridge.CppTestObject" -e lo-main-delay 2
commit 42acf7a6d5cf91aed5ed4aa0d9ce09b3d0203b01
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 21 18:03:48 2011 +0200
Don't use USE_DOUBLE_MMAP on Android
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 21c335b..c21fb76 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -39,8 +39,7 @@
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
- || defined(NETBSD) || defined(DRAGONFLY) \
- || defined(ANDROID) /* Not sure about Android, but let's see... */
+ || defined(NETBSD) || defined(DRAGONFLY)
#define USE_DOUBLE_MMAP
#endif
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 737824c..9869bb5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -488,10 +488,16 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
}
unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
- Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ Slot ** slots, unsigned char * code,
+#ifdef USE_DOUBLE_MMAP
+ sal_PtrDiff writetoexecdiff,
+#endif
typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
sal_Int32 functionCount, sal_Int32 vtableOffset)
{
+#ifndef USE_DOUBLE_MMAP
+ const sal_PtrDiff writetoexecdiff = 0;
+#endif
(*slots) -= functionCount;
Slot * s = *slots;
for (sal_Int32 i = 0; i < type->nMembers; ++i)
commit f62c8ecdfce2ac32f82275d27218c1cdb65a6de6
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 21 17:39:56 2011 +0200
Use -fno-omit-frame-pointer for Android (no idea if essential)
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 20fcb10..595ed20 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -112,6 +112,8 @@ icu_CFLAGS+=-DUCONFIG_NO_FILE_IO
.IF "$(OS)"=="ANDROID"
# Problems with uint64_t on Android unless disabling strictness
DISABLE_STRICT=--disable-strict
+icu_CFLAGS+=-fno-omit-frame-pointer
+icu_CXXFLAGS+=-fno-omit-frame-pointer
.ENDIF
.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
commit edda1f9a34e23c0087e1d4f7cf21f60fbd76f070
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 21 16:31:57 2011 +0200
Bah, don't bother with conditional copying of stuff into the .apk here
You are not expected to be make'ing here without knowing what you are
doing anyway. Just unconditionally require the stuff needed by the
sample cppunit tests mentioned on the last lines.
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index 940e100..e7d6c67 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -10,10 +10,6 @@ arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1
cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
endef
-define CONDCOPY
-test -f $(1) && $(call COPY,$(1),$(2))
-endef
-
# The default target just builds
all: ndk-build
unset JAVA_HOME && ant debug
@@ -44,11 +40,11 @@ ndk-build:
# this, these might not have been built yet.
#
for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
- $(call CONDCOPY,$${F},`basename $${F}`); \
+ $(call COPY,$${F},`basename $${F}`); \
done
#
for F in i18npool_test_breakiterator; do \
- $(call CONDCOPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
+ $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
done
#
@@ -78,7 +74,7 @@ ndk-build:
xmlreader \
bootstrap.uno \
i18npool.uno); do \
- $(call CONDCOPY,$(OUTDIR)/lib/lib$${F}.so); \
+ $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
done
#
# Then the shared GNU C++ library
commit 4b294b2c20aa78b2c70cb71d503195eb5479159c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 21 16:25:13 2011 +0200
Add the localedata_en and localedata_others libs
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index dd392f5..940e100 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -65,6 +65,8 @@ ndk-build:
icudatalo \
icui18nlo \
icuuclo \
+ localedata_en \
+ localedata_others \
reg \
store \
ucbhelper4gcc3 \
More information about the Libreoffice-commits
mailing list