[Libreoffice-commits] core.git: 3 commits - android/source bin/oss-fuzz-build.sh Makefile.in solenv/bin translations

[Caolán McNamara]

 Makefile.in                 |    2 +-
 android/source/build.gradle |    5 +----
 bin/oss-fuzz-build.sh       |    6 ++++--
 solenv/bin/native-code.py   |    5 +++++
 translations                |    2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit ebc7beb6626a330631cf5e12f0cd8b85f5da1bfa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 15 12:44:08 2017 +0100

    ofz: need more services
    
    Change-Id: Iaa594d85aad4b1ee3dd31029fc50c5a1d8997f57

diff --git a/Makefile.in b/Makefile.in
index 475ec0aabe66..04aa28a8cd6c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -475,7 +475,7 @@ $(foreach ide,\
     eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide))))
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngf
 uzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Library_binaryurp Library_io Library_invocation Library_namingservice Library_proxyfac Library_uuresolver Module_ure Exe
 cutable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 642e478fdbd2..577d73753a0d 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -24,9 +24,11 @@ make fuzzers
 cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf instdir/share/fonts/truetype/Liberation* $OUT
 #minimal runtime requirements
 rm -rf $OUT/services $OUT/types $OUT/*rdb
+mkdir $OUT/services
 pushd instdir/program
-cp -r *fuzzer *rc *rdb services types $OUT
-mv $OUT/services/services.rdb $OUT/services.rdb
+cp -r *fuzzer *rc types.rdb types $OUT
+head -c -14 services.rdb  > $OUT/services.rdb
+tail -c +85 ./services/services.rdb >> $OUT/services.rdb
 popd
 
 #starting corpuses
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d0f1726dd65e..21adb83ac769 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -236,6 +236,11 @@ core_constructor_list = [
     "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
 # xmloff/util/xo.component
     "XMLVersionListPersistence_get_implementation",
+# xmlscript/util/xmlscript.component
+    "com_sun_star_comp_xmlscript_XMLBasicExporter",
+    "com_sun_star_comp_xmlscript_XMLBasicImporter",
+    "com_sun_star_comp_xmlscript_XMLOasisBasicExporter",
+    "com_sun_star_comp_xmlscript_XMLOasisBasicImporter",
     ]
 
 # edit group for apps, where you can edit documents
commit e62c94684a29c1f9cf7b338c8e60ee75afcbddda
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 15 10:08:22 2017 +0100

    Updated core
    Project: translations  a6fff45b6a770e18755c2ea1ed52f92d3231802f
    
    fix translation
    
    Change-Id: I496fe30f2a1d15c2f0c13fe5c003b07b465a6ad8

diff --git a/translations b/translations
index 914e0f7a7624..a6fff45b6a77 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 914e0f7a76244c738c1917b99bb162e4f6645ffb
+Subproject commit a6fff45b6a770e18755c2ea1ed52f92d3231802f
commit dc93e5cc7c2157d51975d8a78a193bbc76bb0a6b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Sep 4 23:26:43 2017 +0200

    android: textrelocations are no longer an issue (can target 23 and later)
    
    Change-Id: Ib80651bf3b23cf74abc76472c247b83622046700

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 5f850c197122..970ffeed3534 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -51,10 +51,7 @@ android {
     }
     defaultConfig {
         minSdkVersion 14
-        // openssl on x86 makes the native-code.so contain text-relocations,
-        // 22 treats them as warnings, on 23 it is fatal error
-        // ToDo: fix openssl stuff to not block targeting 23 or later
-        targetSdkVersion 22
+        targetSdkVersion 24
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {