android/Bootstrap/Makefile.shared | 2
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java | 1
android/experimental/DocumentLoader/Makefile | 2
android/experimental/LibreOffice4Android/Makefile | 2
android/qa/sc/Makefile | 24 +++++------
5 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit ba425a1788421b63caa84ac364341bac2f88f103
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Sep 4 14:00:20 2012 +0300
Try to make this work again
Unfortunately it crashes without a usable stack trace, though... Not
sure whether worth it to dig any deeper.
Change-Id: I3a5864326bead6ac9206ef30436326b97564bb63
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 5c2de66..f0cdfc0 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -77,6 +77,7 @@ copy-stuff:
introspection.uno \
jvmaccessgcc3 \
jvmfwk \
+ libotouchlo \
localedata_en \
localedata_es \
localedata_euro \
@@ -109,7 +110,7 @@ copy-stuff:
done
#
# Then the shared GNU C++ library
- $(call
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_APP_ABI)/libgnustl_shared.so)
+ $(call
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ANDROID_APP_ABI)/libgnustl_shared.so)
#
# Then other "assets" that can be left in the .apk. Let the directory
# structure under assets mimic that under solver or workdir for now.
@@ -127,9 +128,6 @@ copy-stuff:
mkdir -p assets/ComponentTarget/`dirname $$F`; \
sed -e
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g'
<$(WORKDIR)/ComponentTarget/$$F.component
>assets/ComponentTarget/$$F.component; \
done
- 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
cp -R $(OUTDIR)/xml/registry assets/xml
#
# .res files
@@ -143,9 +141,12 @@ copy-stuff:
# Then assets that are unpacked at run-time into the app's data directory.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
+# The indirect command lines...
+ echo "SAL_LOG=+WARN+INFO-INFO.legacy.osl STAR_RESOURCEPATH=/assets/bin
$(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/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >assets/unpack/ucalc.cmdline
+ echo "SAL_LOG=+WARN+INFO-INFO.legacy.osl STAR_RESOURCEPATH=/assets/bin
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry
module:file:///assets/xml/registry/spool'
'-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/basic/util/sb.component
file:///assets/ComponentTarget/chart2/source/controller/chartcontroller.component
file:///assets/ComponentTarget/chart2/source/tools/charttools.component
file:///assets/ComponentTarget/chart2/source/model/chartmodel.component
file:///assets/ComponentTarget/comphelper/util/comphelp.component
file:///assets/ComponentTarget/dbaccess/util/dba.component
file:///assets/ComponentTarget/eventattacher/source/evtatt.component
file:///assets/ComponentTarget/fileaccess/source/fileacc.component
file:///assets/Comp
onentTarget/filter/source/config/cache/filterconfig1.component
file:///assets/ComponentTarget/forms/util/frm.component
file:///assets/ComponentTarget/oox/util/oox.component
file:///assets/ComponentTarget/package/source/xstor/xstor.component
file:///assets/ComponentTarget/package/util/package2.component
file:///assets/ComponentTarget/sax/source/expatwrap/expwrap.component
file:///assets/ComponentTarget/sax/source/fastparser/fastsax.component
file:///assets/ComponentTarget/sc/util/sc.component
file:///assets/ComponentTarget/sc/util/scfilt.component
file:///assets/ComponentTarget/scaddins/source/analysis/analysis.component
file:///assets/ComponentTarget/scaddins/source/datefunc/date.component
file:///assets/ComponentTarget/sot/util/sot.component
file:///assets/ComponentTarget/svl/util/svl.component
file:///assets/ComponentTarget/toolkit/util/tk.component
file:///assets/ComponentTarget/ucb/source/ucp/tdoc/ucptdoc1.component
file:///assets/ComponentTarget/unotools/util/utl.compon
ent file:///assets/ComponentTarget/unoxml/source/rdf/unordf.component
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/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >assets/unpack/filters_test.cmdline
#
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
- cp
$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver
$(SODEST)
+ cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI)
>$(SODEST)/gdb.setup
@@ -155,23 +156,20 @@ build-ant: copy-stuff properties
install: copy-stuff properties
unset JAVA_HOME && $(ANT) debug install
@echo
- @echo 'Run it with "make run"'
+ @echo 'Run either "make run_ucalc" or "make run_filters_test"'
@echo
uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
run_ucalc:
- echo "STAR_RESOURCEPATH=/assets/bin
$(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/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e
lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e
lo-main-indirect-cmdline $(APP_DATA_PATH)/ucalc.cmdline
run_filters_test:
- echo "STAR_RESOURCEPATH=/assets/bin
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry
module:file:///assets/xml/registry/spool'
'-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/basic/util/sb.component
file:///assets/ComponentTarget/chart2/source/controller/chartcontroller.component
file:///assets/ComponentTarget/chart2/source/tools/charttools.component
file:///assets/ComponentTarget/chart2/source/model/chartmodel.component
file:///assets/ComponentTarget/comphelper/util/comphelp.component
file:///assets/ComponentTarget/dbaccess/util/dba.component
file:///assets/ComponentTarget/eventattacher/source/evtatt.component
file:///assets/ComponentTarget/fileaccess/source/fileacc.component
file:///assets/ComponentTarget/filter/source/config/ca
che/filterconfig1.component
file:///assets/ComponentTarget/forms/util/frm.component
file:///assets/ComponentTarget/oox/util/oox.component
file:///assets/ComponentTarget/package/source/xstor/xstor.component
file:///assets/ComponentTarget/package/util/package2.component
file:///assets/ComponentTarget/sax/source/expatwrap/expwrap.component
file:///assets/ComponentTarget/sax/source/fastparser/fastsax.component
file:///assets/ComponentTarget/sc/util/sc.component
file:///assets/ComponentTarget/sc/util/scfilt.component
file:///assets/ComponentTarget/scaddins/source/analysis/analysis.component
file:///assets/ComponentTarget/scaddins/source/datefunc/date.component
file:///assets/ComponentTarget/sot/util/sot.component
file:///assets/ComponentTarget/svl/util/svl.component
file:///assets/ComponentTarget/toolkit/util/tk.component
file:///assets/ComponentTarget/ucb/source/ucp/tdoc/ucptdoc1.component
file:///assets/ComponentTarget/unotools/util/utl.component
file:///assets/ComponentTarget/
unoxml/source/rdf/unordf.component
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/ComponentTarget/ucb/source/core/ucb1.component
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e
lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e
lo-main-indirect-cmdline $(APP_DATA_PATH)/filters_test.cmdline
-run: run_ucalc run_filters_test
+run:
+ @echo Make either run_ucalc or run_filters_test but not both right
after each other
# If you reinstall an app several times, even if you uninstall it
# between, disk space seems to leak that won't get recycled until you
commit f1aca5bf8a2f5d065589f21475c017e0bb8cbc9d
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Sep 4 13:18:07 2012 +0300
Fix infinite loop introduced by accident
Change-Id: I4aee6214123b14f40e01850e1814a4e2d089ec8c
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index b2fc540..116c6c4 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -218,6 +218,7 @@ public class Bootstrap extends NativeActivity
while (argv.length > 0 &&
argv[0].matches("[A-Z_]+=.*")) {
putenv(argv[0]);
+ argv = Arrays.copyOfRange(argv, 1, argv.length-1);
}
// argv[0] will be replaced by android_main() in lo-bootstrap.c by the
commit f9e88410cffcfe8765770486aa3736cd82726e9f
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Sep 4 10:11:38 2012 +0300
Drop misleading comment
Change-Id: I90bc8870fcc7919f2b9c224160d7cb2e7ef285e7
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index ef736fe..d450409 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -221,7 +221,7 @@ copy-stuff:
build-ant: copy-stuff properties
#
-# Copy jar files we need, and even construct one.
+# Copy jar files we need
#
for F in $(strip \
java_uno \
commit f17665bc408cdb2a3d7bc69e41aefbc1b8134cd6
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Sep 4 10:10:27 2012 +0300
Fix misleading macro name
Change-Id: I6ef47a04c6628723a433bbb625b0934979bd6725
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 2dd2023..f1a7aa9 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -19,7 +19,7 @@ cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug
$(SODEST)$(if $(2),/
cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
endef
-define COPYSOJAR
+define COPYJAR
cp $(1) libs
endef
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 6296b13..3f0be60 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -215,7 +215,7 @@ build-ant: copy-stuff properties
unoil \
unoloader \
); do \
- $(call COPYSOJAR,$(OUTDIR)/bin/$${F}.jar); \
+ $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
done
#
unset JAVA_HOME && $(ANT) debug
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
