diff options
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/android/Makefile | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile index e7d6c6798486..660126ce8802 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 |