mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: tune symbols for lldb & we actually target 14 as minSDK

Browse Source 
-glldb might be placebo switch like -ggdb2, but at last it won't hurt
:-)
increase java heap size for gradle to allow inprocess dex as well as
actually processing the huge files.
furthermore fix platform level in configure to match the minSDK value
from build.gradle

Change-Id: I57d7d4c67bc3e5ed8bfed1e592b85211b5b8905a
Reviewed-on: https://gerrit.libreoffice.org/42162
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Christian Lohmaier
2017-09-07 18:27:12 +02:00
parent 8c1140e623
commit 3de5cd341d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/source/gradle.properties Normal file
View File

@@ -0,0 +1 @@
org.gradle.jvmargs=-Xmx2048m

11
configure.ac
View File

@@ -474,18 +474,15 @@ if test -n "$with_android_ndk"; then
fi fi
fi fi
ANDROID_API_LEVEL=15 ANDROID_API_LEVEL=14
if test $host_cpu = arm; then if test $host_cpu = arm; then
android_gnu_prefix=arm-linux-androideabi android_gnu_prefix=arm-linux-androideabi
elif test $host_cpu = aarch64; then elif test $host_cpu = aarch64; then
android_gnu_prefix=aarch64-linux-android android_gnu_prefix=aarch64-linux-android
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/" ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/"
ANDROID_API_LEVEL=L ANDROID_API_LEVEL=21
elif test $host_cpu = mips; then elif test $host_cpu = mips; then
android_gnu_prefix=mipsel-linux-android android_gnu_prefix=mipsel-linux-android
elif test $ANDROID_NDK_VERSION = r8; then
# The prefix used for the x86 tool-chain changed between NDK r8 and r8b
android_gnu_prefix=i686-android-linux
else else
android_gnu_prefix=i686-linux-android android_gnu_prefix=i686-linux-android
fi fi
@@ -850,7 +847,7 @@ linux-android*)
;; ;;
esac esac
if echo "$host_os" | grep -q linux-android ; then if test "$_os" = "Android" ; then
if test -z "$with_android_sdk"; then if test -z "$with_android_sdk"; then
AC_MSG_ERROR([the --with-android-sdk option is mandatory, unless it is available at external/android-sdk-linux/.]) AC_MSG_ERROR([the --with-android-sdk option is mandatory, unless it is available at external/android-sdk-linux/.])
fi fi
@@ -11883,7 +11880,7 @@ else
fi fi
AC_SUBST(OOO_VENDOR) AC_SUBST(OOO_VENDOR)
if echo "$host_os" | grep -q linux-android ; then if test "$_os" = "Android" ; then
ANDROID_PACKAGE_NAME= ANDROID_PACKAGE_NAME=
AC_MSG_CHECKING([for Android package name]) AC_MSG_CHECKING([for Android package name])
if test -z "$with_android_package_name" -o "$with_android_package_name" = "no"; then if test -z "$with_android_package_name" -o "$with_android_package_name" = "no"; then

4
solenv/gbuild/platform/com_GCC_defs.mk
View File

@@ -165,8 +165,10 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
# optimization level # optimization level
gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
ifeq ($(OS),ANDROID)
gb_DEBUGINFO_FLAGS=-glldb
# Clang does not know -ggdb2 or some other options # Clang does not know -ggdb2 or some other options
ifeq ($(HAVE_GCC_GGDB2),TRUE) else ifeq ($(HAVE_GCC_GGDB2),TRUE)
gb_DEBUGINFO_FLAGS=-ggdb2 gb_DEBUGINFO_FLAGS=-ggdb2
else else
gb_DEBUGINFO_FLAGS=-g2 gb_DEBUGINFO_FLAGS=-g2