Attention is currently required from: plaisthos.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/895?usp=email
to look at the new patch set (#3).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: Add Android cmake building
......................................................................
Add Android cmake building
There is a mode to build with a real Android NDK that requires setting up cmake
to build with the NDK and so.
For quick&dirty compile tests that do not actually use the Android NDK on
Linux, -DFAKE_ANDROID on Linux can be
used to compile a binary using TARGET_ANDROID.
Change-Id: If6afa1108f9234f98afdbe0de7b7320403871772
Signed-off-by: Arne Schwabe <[email protected]>
---
M CMakeLists.txt
M config.h.cmake.in
2 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/95/895/3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5081e81..b04adce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,7 @@
option(ENABLE_LZO "BUILD with lzo" ON)
option(ENABLE_PKCS11 "BUILD with pkcs11-helper" ON)
option(USE_WERROR "Treat compiler warnings as errors (-Werror)" ON)
+option(FAKE_ANDROID "Target Android but do not use actual cross
compile/Android cmake to build for simple compile checks on Linux")
set(PLUGIN_DIR /usr/local/lib/openvpn/plugins CACHE FILEPATH "Location of the
plugin directory")
@@ -122,7 +123,14 @@
set(CMAKE_C_STANDARD 11)
# Set the various defines for config.h.cmake.in
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Android" OR ${FAKE_ANDROID})
+ set(TARGET_ANDROID YES)
+ set(ENABLE_ASYNC_PUSH YES)
+ set(ENABLE_SITNL YES)
+ set(HAVE_LINUX_TYPES_H 1)
+ # Wacky workaround as OpenSSL package detection is otherwise broken
(https://stackoverflow.com/questions/45958214/android-cmake-could-not-find-openssl)
+ list(APPEND CMAKE_FIND_ROOT_PATH ${OPENSSL_ROOT_DIR})
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(TARGET_LINUX YES)
set(ENABLE_ASYNC_PUSH YES)
set(ENABLE_LINUXDCO YES)
diff --git a/config.h.cmake.in b/config.h.cmake.in
index 74a53a6..2f7b43d 100644
--- a/config.h.cmake.in
+++ b/config.h.cmake.in
@@ -432,6 +432,9 @@
/* Are we running WIN32? */
#cmakedefine TARGET_WIN32
+/* Are we targeting Android? */
+#cmakedefine TARGET_ANDROID
+
#define TARGET_ALIAS "@CMAKE_SYSTEM_NAME@"
/* Enable GNU extensions on systems that have them. */
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/895?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If6afa1108f9234f98afdbe0de7b7320403871772
Gerrit-Change-Number: 895
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
