[Libreoffice-commits] core.git: android/source

[Christian Lohmaier]

 android/source/build.gradle |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5b791ec5e0bd6e05769bf9683d9e1f8b3344b9a5
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Oct 12 02:48:53 2015 +0200

    android can only target sdk 22 - openssl triggers text relocation errors
    
     scanelf -T android/source/obj/local/x86/liblo-native-code.so
     TYPE   TEXTRELS FILE
      liblo-native-code.so: (memory/data?) [0x30E35B6] in (optimized out: previous OPENSSL_rdtsc) [0x30E35B0]
      liblo-native-code.so: (memory/data?) [0x30E35D2] in (optimized out: previous OPENSSL_instrument_halt) [0x30E35D0]
      liblo-native-code.so: (memory/data?) [0x30E3646] in (optimized out: previous OPENSSL_wipe_cpu) [0x30E3640]
      liblo-native-code.so: (memory/data?) [0x30E494C] in (optimized out: previous sha1_block_data_order) [0x30E4940]
      liblo-native-code.so: (memory/data?) [0x30E79BA] in (optimized out: previous sha512_block_data_order) [0x30E7980]
      liblo-native-code.so: (memory/data?) [0x30EB7B2] in (optimized out: previous AES_encrypt) [0x30EB780]
      liblo-native-code.so: (memory/data?) [0x30ECDF2] in (optimized out: previous AES_decrypt) [0x30ECDC0]
      liblo-native-code.so: (memory/data?) [0x30ECE89] in (optimized out: previous AES_cbc_encrypt) [0x30ECE70]
    ET_DYN  android/source/obj/local/x86/liblo-native-code.so
    
    with target level 22 it is only a warning:
    W/linker:
    /mnt/asec/org.documentfoundation.libreoffice-1/lib/x86/liblo-native-code.so has
    text relocations. This is wasting memory and prevents security hardening.
    Please fix.
    
    with target level 23 it is java.lang.UnsatisfiedLinkError
    
    Change-Id: Ia55c75c46a64854e46aab3329fef3e9b522a5ba2

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 8e2355c..3f476c2 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -53,7 +53,10 @@ android {
     // defaults for Manifest
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        // 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
         manifestPlaceholders = [installLocation: "preferExternal"]
     }
     buildTypes {