summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMert Tumer <mert.tumer@collabora.com>2022-02-08 16:18:24 +0300
committerAndras Timar <andras.timar@collabora.com>2022-02-08 20:12:06 +0100
commitbf1993413e1a45c4f900aec163a15a6bc5861a2a (patch)
treea3dc579f4100a2db7ef6aa4409b37304454b0dd3
parentBump package version to 6.4.20-1 (diff)
downloadonline-bf1993413e1a45c4f900aec163a15a6bc5861a2a.tar.gz
online-bf1993413e1a45c4f900aec163a15a6bc5861a2a.zip
fix android build failure
CMakeLists.txt lacks recently added Exceptions.cpp file and also needed <string> header in Exceptions.hpp Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Change-Id: I183cc9d71e3f98e63d2a0d0b79229b8311bfd611
-rw-r--r--android/lib/src/main/cpp/CMakeLists.txt.in1
-rw-r--r--wsd/Exceptions.hpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in
index 410fc8399d..8cd5b643e0 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -22,6 +22,7 @@ add_library(androidapp SHARED
../../../../../kit/Kit.cpp
../../../../../net/FakeSocket.cpp
../../../../../net/Socket.cpp
+ ../../../../../wsd/Exceptions.cpp
../../../../../wsd/ClientSession.cpp
../../../../../wsd/DocumentBroker.cpp
../../../../../wsd/LOOLWSD.cpp
diff --git a/wsd/Exceptions.hpp b/wsd/Exceptions.hpp
index 3c8910be73..33af545ff9 100644
--- a/wsd/Exceptions.hpp
+++ b/wsd/Exceptions.hpp
@@ -13,6 +13,7 @@
#include <atomic>
#include <exception>
#include <stdexcept>
+#include <string>
// not beautiful
#define EXCEPTION_DECL(type,parent_cl) \