[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer' - 2 commits - configure.ac solenv/bin

[Jan Holesovsky]

 configure.ac              |    4 ++++
 solenv/bin/native-code.py |   10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 5046527d6146897c26b657c7eb98b4a5613b24da
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Feb 17 15:24:41 2015 +0100

    android: No need to include the entire libfrmlo.a, add just the used services.
    
    Made sure that ooo108922-1.doc and fields.doc are still loading.
    
    Change-Id: If009c25be1776eba77a397efb2eae820838ac053

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index c212c25..eedf87d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -33,6 +33,7 @@ core_factory_list = [
     ("libhyphenlo.a", "hyphen_component_getFactory"),
     ("libi18npoollo.a", "i18npool_component_getFactory"),
     ("libi18nsearchlo.a", "i18nsearch_component_getFactory"),
+    ("libinvocadaptlo.a", "invocadapt_component_getFactory"),
     ("liblnglo.a", "lng_component_getFactory"),
     ("liblnthlo.a", "lnth_component_getFactory"),
     ("liblocalebe1lo.a", "localebe1_component_getFactory"),
@@ -57,6 +58,7 @@ core_factory_list = [
     ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#ifndef ANDROID"),
     ("libxstor.a", "xstor_component_getFactory"),
     ("libcanvasfactorylo.a", "canvasfactory_component_getFactory"),
+    ("libvbaeventslo.a", "vbaevents_component_getFactory"),
     ("libvclcanvaslo.a", "vclcanvas_component_getFactory"),
     ("libmtfrendererlo.a", "mtfrenderer_component_getFactory"),
     ]
@@ -88,6 +90,12 @@ core_constructor_list = [
 # dbaccess/util/dba.component
     "com_sun_star_comp_dba_ORowSet_get_implementation",
 # forms/util/frm.component
+    "com_sun_star_form_OCheckBoxControl_get_implementation",
+    "com_sun_star_form_OCheckBoxModel_get_implementation",
+    "com_sun_star_form_OComboBoxControl_get_implementation",
+    "com_sun_star_form_OComboBoxModel_get_implementation",
+    "com_sun_star_form_ODateControl_get_implementation",
+    "com_sun_star_form_ODateModel_get_implementation",
     "com_sun_star_comp_forms_ODatabaseForm_get_implementation",
     "com_sun_star_form_OFormsCollection_get_implementation",
 # framework/util/fwk.component
@@ -144,6 +152,7 @@ core_constructor_list = [
 # stoc/source/inspect/introspection.component
     "com_sun_star_comp_stoc_Introspection_get_implementation",
 # toolkit/util/tk.component
+    "stardiv_Toolkit_StdTabController_get_implementation",
     "stardiv_Toolkit_UnoCheckBoxControl_get_implementation",
     "stardiv_Toolkit_UnoComboBoxControl_get_implementation",
     "stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation",
@@ -197,7 +206,6 @@ draw_constructor_list = [
     ]
 
 writer_factory_list = [
-    ("libfrmlo.a", "frm_component_getFactory"),
     ("libsblo.a", "sb_component_getFactory"),
     ("libswdlo.a", "swd_component_getFactory"),
     ("libswlo.a", "sw_component_getFactory"),
commit d3adc100afa44c748f7bd386aaed69f87d40b034
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Feb 17 13:24:00 2015 +0100

    android: Better check for package name when debugging.
    
    Change-Id: Iad29aa8cc47220e5aa33a4991a0c0d265d107152

diff --git a/configure.ac b/configure.ac
index 34b129a..a195dd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12316,6 +12316,10 @@ if echo "$host_os" | grep -q linux-android ; then
 
         AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_NAME])
     else
+        if test -n "$ENABLE_DEBUG" -a "$with_android_package_name" != "org.libreoffice" ; then
+            AC_MSG_ERROR([The package name must be set
+to org.libreoffice when debugging, please avoid --with-android-package-name.])
+        fi
         ANDROID_PACKAGE_NAME="$with_android_package_name"
         AC_MSG_RESULT([$ANDROID_PACKAGE_NAME])
     fi