.gitignore | 21 +++ Mobile/Android/README | 17 --- android/.gitignore | 5 android/README | 35 ++++++ android/app/.gitignore | 3 android/app/build.gradle | 39 +++++++ android/app/proguard-rules.pro | 17 +++ android/app/src/main/AndroidManifest.xml | 23 ++++ android/app/src/main/cpp/CMakeLists.txt | 50 +++++++++ android/app/src/main/cpp/androidapp.c | 14 ++ android/app/src/main/cpp/androidapp.h | 12 ++ android/build.gradle | 25 ++++ android/gradlew | 172 +++++++++++++++++++++++++++++++ android/gradlew.bat | 84 +++++++++++++++ android/settings.gradle | 1 common/Protocol.hpp | 2 common/SigUtil.cpp | 8 + common/Util.cpp | 1 configure.ac | 31 ++++- wsd/LOOLWSD.cpp | 4 wsd/TraceFile.hpp | 2 21 files changed, 537 insertions(+), 29 deletions(-)
New commits: commit d15fc93f312882037f9991335b945f8c3676a43d Author: Jan Holesovsky <[email protected]> AuthorDate: Tue Feb 12 10:15:51 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Tue Feb 12 10:50:40 2019 +0100 android: Define MOBILEAPP via config.h. diff --git a/configure.ac b/configure.ac index 3e4c919f6..d0d330212 100644 --- a/configure.ac +++ b/configure.ac @@ -461,13 +461,16 @@ AS_IF([test "$ENABLE_GTKAPP" = true], AM_CONDITIONAL([ENABLE_DEBUG], [test "$ENABLE_DEBUG" = "true"]) mobile_app= +MOBILEAPP= AC_MSG_CHECKING([Is this a mobile app]) if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp"; then AC_MSG_RESULT([Yes]) mobile_app=true; + MOBILEAPP=1 else AC_MSG_RESULT([No]) fi +AC_DEFINE_UNQUOTED([MOBILEAPP],[$MOBILEAPP],[Define to 1 if this is a mobileapp (eg. Android) build.]) ENABLE_SSL=true if test "$enable_ssl" != "no" -a "$mobile_app" != "true"; then diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 30beb7b28..a26fb31bb 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -138,8 +138,10 @@ using Poco::Net::PartHandler; #ifdef MOBILEAPP #ifdef IOS #include "ios.h" -#else +#elif GTKAPP #include "gtk.hpp" +#elif defined(__ANDROID__) +#include "androidapp.h" #endif #endif commit df5565674e94fa6c2dc201c665bf013c4b75e552 Author: Jan Holesovsky <[email protected]> AuthorDate: Tue Feb 12 10:15:20 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Tue Feb 12 10:50:40 2019 +0100 android: Fix minor build issues. diff --git a/common/Protocol.hpp b/common/Protocol.hpp index c934b6b44..cc1922deb 100644 --- a/common/Protocol.hpp +++ b/common/Protocol.hpp @@ -286,7 +286,7 @@ namespace LOOLProtocol inline std::string getAbbreviatedMessage(const std::string& message) { - const size_t pos = Util::getDelimiterPosition(message.data(), std::min(message.size(), 501UL), '\n'); + const size_t pos = Util::getDelimiterPosition(message.data(), std::min<size_t>(message.size(), 501), '\n'); // If first line is less than the length (minus newline), add ellipsis. if (pos < static_cast<std::string::size_type>(message.size()) - 1) diff --git a/wsd/TraceFile.hpp b/wsd/TraceFile.hpp index 3afd4be5a..5f3ac7202 100644 --- a/wsd/TraceFile.hpp +++ b/wsd/TraceFile.hpp @@ -434,7 +434,7 @@ private: _records[0].getDir() != TraceFileRecord::Direction::Event || _records[0].getPayload().find("NewSession") != 0) { - fprintf(stderr, "Invalid trace file with %ld records. First record: %s\n", _records.size(), + fprintf(stderr, "Invalid trace file with %ld records. First record: %s\n", static_cast<long>(_records.size()), _records.empty() ? "<empty>" : _records[0].getPayload().c_str()); throw std::runtime_error("Invalid trace file."); } commit e60421e5d5378106244b2bafea8756a40037105d Author: Jan Holesovsky <[email protected]> AuthorDate: Tue Feb 12 10:14:25 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Tue Feb 12 10:50:40 2019 +0100 android: No execinfo.h on Android (yet). diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp index 77ed8e296..fea7ca16f 100644 --- a/common/SigUtil.cpp +++ b/common/SigUtil.cpp @@ -11,7 +11,9 @@ #include "SigUtil.hpp" -#include <execinfo.h> +#if !defined(__ANDROID__) +# include <execinfo.h> +#endif #include <csignal> #include <sys/poll.h> #include <sys/stat.h> @@ -198,6 +200,7 @@ namespace SigUtil char header[32]; sprintf(header, "Backtrace %d:\n", getpid()); +#if !defined(__ANDROID__) const int maxSlots = 50; void *backtraceBuffer[maxSlots]; int numSlots = backtrace(backtraceBuffer, maxSlots); @@ -223,6 +226,9 @@ namespace SigUtil } } } +#else + LOG_SYS("Backtrace not available on Android."); +#endif if (std::getenv("LOOL_DEBUG")) { diff --git a/common/Util.cpp b/common/Util.cpp index 048526a49..7c9c2f24e 100644 --- a/common/Util.cpp +++ b/common/Util.cpp @@ -11,7 +11,6 @@ #include "Util.hpp" -#include <execinfo.h> #include <csignal> #include <sys/poll.h> #ifdef __linux commit 4f03f09c534d4b7ac7d397ed697cfebfacaf1895 Author: Jan Holesovsky <[email protected]> AuthorDate: Tue Feb 12 10:13:16 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Tue Feb 12 10:50:40 2019 +0100 android: Gradle project and other stuff to build. diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 000000000..c5b7553a2 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,5 @@ +.gradle +.idea +/android.iml +/gradle +/local.properties diff --git a/android/README b/android/README index bbd822375..d43ac6cb0 100644 --- a/android/README +++ b/android/README @@ -24,6 +24,12 @@ # install it to /opt/poco-android make ANDROID_ABI=armeabi-v7a TOOL=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ install INSTALLDIR=/opt/poco-android -* Build the online.git +* Configure the online.git ./autogen.sh && ./configure CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ --host=arm-linux-androideabi --enable-silent-rules --with-lokit-path=/local/libreoffice/master-android/include --with-lo-path=/local/libreoffice/master-android/instdir --with-poco-includes=/opt/poco-android/include --with-poco-libs=/opt/poco-android --with-libpng-includes=/local/libreoffice/master-android/workdir/UnpackedTarball/libpng --with-libpng-libs=/local/libreoffice/master-android/workdir/LinkTarget/StaticLibrary --disable-setcap --enable-androidapp --with-logfile=/tmp/loolwsd.log --enable-debug + +* Build it + + + Start Android Studio + + Open this 'android' subdir as a project + + Build from Android Studio (Build -> Make Project) diff --git a/android/app/.gitignore b/android/app/.gitignore new file mode 100644 index 000000000..6478cef62 --- /dev/null +++ b/android/app/.gitignore @@ -0,0 +1,3 @@ +/.externalNativeBuild +/app.iml +/build diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 000000000..c70779866 --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,39 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId 'org.libreoffice.androidapp' + minSdkVersion 21 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + } + buildTypes { + debug { + ndk { + //abiFilters "x86", "armeabi-v7a", "armeabi" + abiFilters "armeabi-v7a" + } + } + release { + ndk { + abiFilters "armeabi-v7a" + } + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), + 'proguard-rules.pro' + } + } + externalNativeBuild { + cmake { + path "src/main/cpp/CMakeLists.txt" + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' +} diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 000000000..b7420a70b --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/gfan/dev/sdk_current/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..4dbb54368 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android"; + package="org.libreoffice.androidapp"> + + <!--application + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:supportsRtl="true" + android:theme="@style/AppTheme"--> + <application + android:allowBackup="true" + android:supportsRtl="true"> + <activity android:name=".MainActivity"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt new file mode 100644 index 000000000..6c78b4f08 --- /dev/null +++ b/android/app/src/main/cpp/CMakeLists.txt @@ -0,0 +1,50 @@ +cmake_minimum_required(VERSION 3.4.1) + +add_library(androidapp SHARED + androidapp.c + ../../../../../common/FileUtil.cpp + ../../../../../common/Log.cpp + ../../../../../common/MessageQueue.cpp + ../../../../../common/Protocol.cpp + ../../../../../common/Session.cpp + ../../../../../common/SigUtil.cpp + ../../../../../common/SpookyV2.cpp + ../../../../../common/Unit.cpp + ../../../../../common/Util.cpp + ../../../../../kit/ChildSession.cpp + ../../../../../kit/Kit.cpp + ../../../../../net/FakeSocket.cpp + ../../../../../net/Socket.cpp + ../../../../../wsd/ClientSession.cpp + ../../../../../wsd/DocumentBroker.cpp + ../../../../../wsd/LOOLWSD.cpp + ../../../../../wsd/Storage.cpp + ../../../../../wsd/TileCache.cpp) + +target_compile_definitions(androidapp PRIVATE LOOLWSD_CONFIGDIR="/etc/loolwsd") # TODO somewhere in assets maybe? + +target_include_directories(androidapp PRIVATE + . # path to androidapp.h + ../../../../.. # path to config.h + ../../../../../common # the needed loolwsd includes + ../../../../../kit + ../../../../../net + ../../../../../wsd + /opt/poco-android/include # POCO + /local/libreoffice/master-android/workdir/UnpackedTarball/libpng # libpng + /local/libreoffice/master-android/include # LibreOfficeKit + ) + +target_link_libraries(androidapp + android + log + /local/libreoffice/master-android/workdir/LinkTarget/StaticLibrary/liblibpng.a + /opt/poco-android/lib/libPocoEncodings.a + /opt/poco-android/lib/libPocoFoundation.a + /opt/poco-android/lib/libPocoJSON.a + /opt/poco-android/lib/libPocoNet.a + /opt/poco-android/lib/libPocoRedis.a + /opt/poco-android/lib/libPocoUtil.a + /opt/poco-android/lib/libPocoXML.a + -static-libstdc++ + ) diff --git a/android/app/src/main/cpp/androidapp.c b/android/app/src/main/cpp/androidapp.c new file mode 100644 index 000000000..532a9e59b --- /dev/null +++ b/android/app/src/main/cpp/androidapp.c @@ -0,0 +1,14 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "androidapp.h" + +int loolwsd_server_socket_fd = -1; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/android/app/src/main/cpp/androidapp.h b/android/app/src/main/cpp/androidapp.h new file mode 100644 index 000000000..59a9faa5b --- /dev/null +++ b/android/app/src/main/cpp/androidapp.h @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +extern int loolwsd_server_socket_fd; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 000000000..d17925d95 --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,25 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.3.1' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 000000000..cccdd3d51 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 000000000..e95643d6a --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 000000000..e7b4def49 --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1 @@ +include ':app' commit 32370233b566206ff0a83dfc2987e822ed820f9c Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Feb 11 21:00:06 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Tue Feb 12 10:50:40 2019 +0100 Update .gitignore. diff --git a/.gitignore b/.gitignore index 4b2ac0ade..a5c7420b4 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,24 @@ pocoinclude-symlink pocolib-symlink ICU.dat ios/Mobile/Assets.xcassets/AppIcon.appiconset + +# backup and temporary editor files: the only convenience rules allowed here. +*~ +.*sw? +\#* +.\#* +*.kdev4 +.kdev_include_paths +.buckd +.directory +.cproject +.project +.settings +.eclipsesettingfile +eclipsesettingfile.xml +.clang_complete +.cxx_tags +.yavide_proj +.yavide_session +.vscode +*.code-workspace commit e780a021718d2e20248c5d18b19b6dca02a04677 Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Feb 11 19:02:46 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Tue Feb 12 10:50:40 2019 +0100 android: Make it to ./configure. Make of course immediately fails. diff --git a/Mobile/Android/README b/Mobile/Android/README deleted file mode 100644 index e42bb9d8c..000000000 --- a/Mobile/Android/README +++ /dev/null @@ -1,17 +0,0 @@ -** First configure & build LibreOffice core for Android. - -** cross-compile poco: - -git clone https://github.com/pocoproject/poco.git -cd poco -git checkout 1.8.0 - -NDK=/opt/libreoffice/android-ndk-r15c -$NDK/build/tools/make-standalone-toolchain.sh --arch=arm --install-dir=`pwd`/toolchain -PATH="`pwd`/toolchain/bin:$PATH" -./configure --config=Android --no-samples --no-tests -make -s -j4 ANDROID_ABI=armeabi-v7a - -lib/Android/armeabi-v7a/*.a # are the static objects we need ... - -** diff --git a/android/README b/android/README new file mode 100644 index 000000000..bbd822375 --- /dev/null +++ b/android/README @@ -0,0 +1,29 @@ +* Compile LibreOffice master for Android + + Something like the following in autogen.input: + + --build=x86_64-unknown-linux-gnu + --with-android-ndk=/home/$USER/Android/Sdk/ndk-bundle + --with-android-sdk=/home/$USER/Android/Sdk + --with-distro=LibreOfficeAndroid + --enable-sal-log + + And the usual ./autogen.sh && make + +* Build the POCO for Android + + # use the 1.9.0 branch; the 1.9.1 and master did not compile for me + git checkout -b poco-1.9.0 origin/poco-1.9.0 + + # configure + ./configure --config=Android --no-samples --no-tests --minimal + + # make it + make ANDROID_ABI=armeabi-v7a TOOL=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ + + # install it to /opt/poco-android + make ANDROID_ABI=armeabi-v7a TOOL=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ install INSTALLDIR=/opt/poco-android + +* Build the online.git + + ./autogen.sh && ./configure CC=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang CXX=~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++ --host=arm-linux-androideabi --enable-silent-rules --with-lokit-path=/local/libreoffice/master-android/include --with-lo-path=/local/libreoffice/master-android/instdir --with-poco-includes=/opt/poco-android/include --with-poco-libs=/opt/poco-android --with-libpng-includes=/local/libreoffice/master-android/workdir/UnpackedTarball/libpng --with-libpng-libs=/local/libreoffice/master-android/workdir/LinkTarget/StaticLibrary --disable-setcap --enable-androidapp --with-logfile=/tmp/loolwsd.log --enable-debug diff --git a/configure.ac b/configure.ac index 9f446a6f3..3e4c919f6 100644 --- a/configure.ac +++ b/configure.ac @@ -88,6 +88,12 @@ AC_ARG_ENABLE([gtkapp], to work similarly to the iOS app, from the JavaScript and the pseudo WebSocket message plumbing point of view. See gtk/README.])) +AC_ARG_ENABLE([androidapp], + AS_HELP_STRING([--enable-androidapp], + [Use in a tree where the only purpose is to build the Android app that is supposed + to work similarly to the iOS app, from the JavaScript and the pseudo WebSocket + message plumbing point of view.])) + AC_ARG_ENABLE([seccomp], AS_HELP_STRING([--disable-seccomp], [Disable use of linux/seccomp.h header when kernel on target system does not support it. @@ -394,6 +400,13 @@ AC_SUBST(TILECACHE_PATH) AC_SUBST(SYSTEMPLATE_PATH) AM_CONDITIONAL(HAVE_LO_PATH,[test "$have_lo_path" = "true"]) +ENABLE_ANDROIDAPP= +if test "$enable_androidapp" = "yes"; then + ENABLE_ANDROIDAPP=true +fi +AC_SUBST(ENABLE_ANDROIDAPP) +AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test "$ENABLE_ANDROIDAPP" = "true"]) + AS_IF([test -n "$with_poco_includes"], [CPPFLAGS="$CPPFLAGS -isystem ${with_poco_includes}"]) @@ -426,7 +439,7 @@ AS_IF([test `uname -s` != Darwin], [], [AC_MSG_ERROR([dlopen not found])])]) -AS_IF([test "$ENABLE_IOSAPP" != "true"], +AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true"], [AC_SEARCH_LIBS([png_create_write_struct], [png], [], @@ -436,7 +449,7 @@ AS_IF([test "$ENABLE_IOSAPP" != "true"], PKG_CHECK_MODULES([CPPUNIT], [cppunit]) ]) -AS_IF([test `uname -s` = Linux], +AS_IF([test `uname -s` = Linux -a "$ENABLE_ANDROIDAPP" != "true"], [AC_SEARCH_LIBS([cap_get_proc], [cap], [], @@ -449,7 +462,7 @@ AM_CONDITIONAL([ENABLE_DEBUG], [test "$ENABLE_DEBUG" = "true"]) mobile_app= AC_MSG_CHECKING([Is this a mobile app]) -if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes"; then +if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp"; then AC_MSG_RESULT([Yes]) mobile_app=true; else @@ -469,10 +482,11 @@ fi AM_CONDITIONAL([ENABLE_SSL], [$ENABLE_SSL]) AC_SUBST(ENABLE_SSL) -AC_CHECK_HEADERS([security/pam_appl.h], - [], - [AC_MSG_ERROR([header security/pam_appl.h not found, install PAM development package])]) -AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([No. Install PAM development package])]) +AS_IF([test "$ENABLE_ANDROIDAPP" != "true"], + [AC_CHECK_HEADERS([security/pam_appl.h], + [], + [AC_MSG_ERROR([header security/pam_appl.h not found, install PAM development package])]) + AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([No. Install PAM development package])])]) AC_MSG_CHECKING([whether to build with support public key]) if test "x$with_support_public_key" != "x"; then _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
