android/qa/desktop/Makefile | 9 +++------ android/qa/sc/Makefile | 3 --- desktop/Library_sofficeapp.mk | 9 +++++++++ sal/inc/sal/main.h | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-)
New commits: commit 8ebd23b2518cf22c3405f45464cbfad980726b30 Author: Michael Meeks <michael.me...@suse.com> Date: Tue May 22 10:15:33 2012 +0100 android: re-add main to libsofficeapp for android diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 34dcfc3..4ed40fd 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -91,4 +91,13 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/migration/migration \ )) +# +# We need the lo_main symbol for our boostrap loader +# +ifeq ($(OS),ANDROID) +$(eval $(call gb_Library_add_cobjects,sofficeapp,\ + desktop/source/app/main \ +)) +endif + # vim: set ts=4 sw=4 et: commit 24618117732e1f3651a404adac3b7859a3510eca Author: Michael Meeks <michael.me...@suse.com> Date: Tue May 22 10:16:03 2012 +0100 android: use existing SAL_DLLPUBLIC macros instead of attributes diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index c85bc5a..3de872e 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -44,11 +44,11 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize(); #if defined IOS || defined ANDROID #ifdef __cplusplus -extern "C" __attribute__ ((visibility("default"))) void lo_main(int argc, char **argv); +extern "C" SAL_DLLPUBLIC_EXPORT void lo_main(int argc, char **argv); #endif #define SAL_MAIN_WITH_ARGS_IMPL \ -__attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \ +SAL_DLLPUBLIC_EXPORT void lo_main(int argc, char **argv) \ { \ sal_detail_initialize(argc, argv); \ sal_main_with_args(argc, argv); \ @@ -56,7 +56,7 @@ __attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \ } #define SAL_MAIN_IMPL \ -__attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \ +SAL_DLLPUBLIC_EXPORT void lo_main(int argc, char **argv) \ { \ sal_detail_initialize(argc, argv); \ sal_main(); \ commit 3d9dfcca78c2fb3a01ed42627e3b5ed65f2dd400 Author: Michael Meeks <michael.me...@suse.com> Date: Tue May 22 10:13:56 2012 +0100 android: remove duplicate services.rdb from config, and static bits diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 8e9edae..36ad0c8 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -28,7 +28,7 @@ all: build-ant properties: echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties - echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties + echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties buildrcs: # main sofficerc ini ... @@ -51,7 +51,7 @@ buildrcs: echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu' >> assets/program/fundamentalrc echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc - echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc + echo 'URE_MORE_SERVICES=<$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled' >> assets/program/fundamentalrc echo 'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled' >> assets/program/fundamentalrc @@ -119,15 +119,12 @@ copy-stuff: buildrcs drawinglayerlo \ expwrap.uno \ fileacc \ - fontconfig \ forlo \ foruilo \ - freetype \ fsstorage.uno \ gcc3_uno \ hyphenlo \ i18nisolang1gcc3 \ - i18npaperlo \ i18npool.uno \ i18nutilgcc3 \ icudatalo \ @@ -249,7 +246,7 @@ uninstall: run: echo "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf -env:INIFILENAME=file:///assets/program/sofficerc" > 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 libmergedlo -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 libmergedlo -e lo-strace yes -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline" # add -e lo-strace yes # if you want that # If you reinstall an app several times, even if you uninstall it commit ace21dca6ad66e4399803c61163387fe18b33160 Author: Michael Meeks <michael.me...@suse.com> Date: Mon May 21 21:20:03 2012 +0100 android: remove bits that are now statically linked diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 6600381..7839371 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -66,14 +66,11 @@ copy-stuff: expwrap.uno \ fastsax.uno \ fileacc \ - fontconfig \ forlo \ foruilo \ - freetype \ frmlo \ gcc3_uno \ i18nisolang1gcc3 \ - i18npaperlo \ i18npool.uno \ i18nutilgcc3 \ icudatalo \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits