[Libreoffice-commits] core.git: solenv/bin

[Stephan Bergmann (via logerrit)]

 solenv/bin/native-code.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c614305e306c2f380b85ce9bb518d2732b5542c3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 23 18:55:51 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 23 20:16:34 2020 +0200

    Blind fix for Android
    
    ...after b625194763b43ed09872947165bf3ad4431eb355 "ucb/expand: create
    instances with uno constructors",
    
    > native-code.cxx:532:63: error: expected ';' after top level declarator
    > void * ucb_expand_ExpandContentProviderImpl_get_implementation.a( void *, void * );
    >                                                               ^
    >                                                               ;
    > native-code.cxx:1154:127: error: member reference base type 'void *' is not a structure or union
    >         { "ucb_expand_ExpandContentProviderImpl_get_implementation.a", ucb_expand_ExpandContentProviderImpl_get_implementation.a },
    >                                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
    > 2 errors generated.
    > make[2]: *** [../Bootstrap/Makefile.shared:63: /tinderbox/buildslave/build/android/obj/local/armeabi-v7a/liblo-native-code.so] Error 1
    
    (<https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&
    full-log=1595521801.13246>)
    
    Change-Id: Ic9542a13a34c989c8e1e54be18680d6a93d10631
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99332
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ace981f71a28..e53d3adf83eb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -332,7 +332,7 @@ core_constructor_list = [
 # ucb/source/ucp/file/ucpfile1.component
     "ucb_file_FileProvider_get_implementation",
 # ucb/source/ucp/expand/ucpexpand1.component
-    ("ucb_expand_ExpandContentProviderImpl_get_implementation.a", "#ifdef ANDROID"),
+    ("ucb_expand_ExpandContentProviderImpl_get_implementation", "#ifdef ANDROID"),
 # ucb/source/sorter/srtrs1.component
     "ucb_SortedDynamicResultSetFactory_get_implementation",
 # ucb/source/tdoc/ucptdoc1.component