Android SDL POC

0001-Reproduce-commit.patch

@@ -0,0 +1,38 @@
+From dc4dff0e13ad400958867c4e4c024c373578cc5b Mon Sep 17 00:00:00 2001
+From: Andrii Kalinich <AKalinich@luxoft.com>
+Date: Fri, 23 Oct 2020 18:25:27 -0400
+Subject: [PATCH] Reproduce commit
+
+---
+ .../src/transport_adapter/threaded_socket_connection.cc     | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc
+index eb92599..da5fed1 100644
+--- a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc
++++ b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc
+@@ -125,14 +125,15 @@ TransportAdapter::Error ThreadedSocketConnection::Start() {
+
+ void ThreadedSocketConnection::Finalize() {
+   SDL_LOG_AUTO_TRACE();
+-  if (unexpected_disconnect_) {
+-    SDL_LOG_DEBUG("unexpected_disconnect");
+-    controller_->ConnectionAborted(
+-        device_handle(), application_handle(), CommunicationError());
+-  } else {
++//  if (unexpected_disconnect_) {
++//    SDL_LOG_DEBUG("unexpected_disconnect");
++//    controller_->ConnectionAborted(
++//        device_handle(), application_handle(), CommunicationError());
++//  } else {
+     SDL_LOG_DEBUG("not unexpected_disconnect");
+     controller_->ConnectionFinished(device_handle(), application_handle());
+-  }
++    // Something is missing here
++//  }
+
+   ShutdownAndCloseSocket();
+ }
+-- 
+2.7.4
+

CMakeLists.txt

@@ -43,9 +43,11 @@ set (HMI "web" CACHE STRING "HMI type")
 option(EXTENDED_MEDIA_MODE "Turn on and off extended Madia Manager features relates to PulseAudio A2DP and GStreamer" OFF)
 option(BUILD_SHARED_LIBS "Build all libraries as shared (if ON) or static (if OFF)" OFF)
 option(BUILD_BT_SUPPORT "Bluetooth support" ON)
+option(BUILD_BLE_SUPPORT "Bluetooth Low Energy support" OFF)
+option(BUILD_ANDROID_BT_SUPPORT "Android Bluetooth support" OFF)
 option(BUILD_USB_SUPPORT "libusb support" ON)
 option(BUILD_CLOUD_APP_SUPPORT "Cloud App Transport Support" ON)
-option(BUILD_WEBSOCKET_SERVER_SUPPORT "Web Engine App Transport Support" ON)
+option(BUILD_WEBSOCKET_SERVER_SUPPORT "Web Engine App Transport Support" OFF)
 option(BUILD_BACKTRACE_SUPPORT "backtrace support" ON)
 option(BUILD_TESTS "Possibility to build and run tests" OFF)
 option(TELEMETRY_MONITOR "Enable profiling time test util" ON)
@@ -83,8 +85,8 @@ set(POLICY_OPTION 	"$ENV{POLICY_TYPE}")
 set(SECURITY_OPTION 	"$ENV{SECURITY_MODE}")
 set(COMPONENTS_DIR ${CMAKE_SOURCE_DIR}/src/components)
 set(SNAPSHOT_TAG 	"$ENV{SNAPSHOT_TAG}")
-set(CMAKE_CXX_COMPILER   $ENV{CMAKE_CXX_COMPILER})
-set(CMAKE_C_COMPILER     $ENV{CMAKE_C_COMPILER})
+#set(CMAKE_CXX_COMPILER   $ENV{CMAKE_CXX_COMPILER})
+#set(CMAKE_C_COMPILER     $ENV{CMAKE_C_COMPILER})
 set(BUILDDIR "$ENV{BUILDDIR}")
 
 if (ARCH_TYPE_OPTION)
@@ -180,6 +182,18 @@ get_property(cValue CACHE BUILD_BT_SUPPORT PROPERTY VALUE)
 file(APPEND "${build_config_path}" "//${cHelpString}\n")
 file(APPEND "${build_config_path}" "BUILD_BT_SUPPORT:${cType}=${cValue}\n\n")
 
+get_property(cHelpString CACHE BUILD_BLE_SUPPORT PROPERTY HELPSTRING)
+get_property(cType CACHE BUILD_BLE_SUPPORT PROPERTY TYPE)
+get_property(cValue CACHE BUILD_BLE_SUPPORT PROPERTY VALUE)
+file(APPEND "${build_config_path}" "//${cHelpString}\n")
+file(APPEND "${build_config_path}" "BUILD_BLE_SUPPORT:${cType}=${cValue}\n\n")
+
+get_property(cHelpString CACHE BUILD_ANDROID_BT_SUPPORT PROPERTY HELPSTRING)
+get_property(cType CACHE BUILD_ANDROID_BT_SUPPORT PROPERTY TYPE)
+get_property(cValue CACHE BUILD_ANDROID_BT_SUPPORT PROPERTY VALUE)
+file(APPEND "${build_config_path}" "//${cHelpString}\n")
+file(APPEND "${build_config_path}" "BUILD_ANDROID_BT_SUPPORT:${cType}=${cValue}\n\n")
+
 get_property(cHelpString CACHE BUILD_USB_SUPPORT PROPERTY HELPSTRING)
 get_property(cType CACHE BUILD_USB_SUPPORT PROPERTY TYPE)
 get_property(cValue CACHE BUILD_USB_SUPPORT PROPERTY VALUE)
@@ -252,7 +266,7 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
 set(ARCHIVE_OUTPUT_DIRECTORY ./bin)
 
 set(EXCLUDE_ERROR_FLAGS "-Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations")
-set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -fvisibility=hidden -Werror ${EXCLUDE_ERROR_FLAGS} -Wuninitialized -Wvla")
+set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -fvisibility=hidden ${EXCLUDE_ERROR_FLAGS} -Wuninitialized -Wvla")
 
 if (USE_GOLD_LD)
   execute_process(COMMAND ld -v OUTPUT_VARIABLE result)
@@ -317,6 +331,9 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "QNX")
   SET(BUILD_BT_SUPPORT OFF)
   SET(BUILD_BACKTRACE_SUPPORT OFF)
   SET(EXTENDED_MEDIA_MODE OFF)
+elseif(ANDROID)
+  SET(BUILD_BLE_SUPPORT ON)
+  SET(BUILD_ANDROID_BT_SUPPORT ON)
 endif()
 
 
@@ -332,6 +349,16 @@ if (BUILD_BT_SUPPORT)
   message(STATUS "Bluetooth support enabled")
 endif()
 
+if (BUILD_BLE_SUPPORT)
+  add_definitions(-DBLUETOOTH_LE_SUPPORT)
+  message(STATUS "Bluetooth Low Energy support enabled")
+endif()
+
+if (BUILD_ANDROID_BT_SUPPORT)
+  add_definitions(-DANDROID_BT_SUPPORT)
+  message(STATUS "Bluetooth for Android support enabled")
+endif()
+
 if (BUILD_CLOUD_APP_SUPPORT)
   add_definitions(-DCLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
   message(STATUS "Cloud app websocket support enabled")
@@ -349,7 +376,9 @@ endif()
 
 if(ENABLE_LOG)
   add_definitions(-DENABLE_LOG)
+  if (NOT ANDROID)
   set(install-3rd_party_logger "install-3rd_party_logger")
+  endif ()
   message(STATUS "Logger enabled")
 endif()
 
@@ -432,8 +461,11 @@ include_directories(
 # --- 3rd party libs
 add_subdirectory(./src/3rd_party EXCLUDE_FROM_ALL)
 
-find_package(OpenSSL REQUIRED)
-if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
+if (NOT ANDROID)
+  find_package(OpenSSL REQUIRED)
+endif()
+
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX" AND NOT ANDROID)
   message(STATUS "Including log4cxx")
   include_directories ( ${LOG4CXX_INCLUDE_DIRECTORY} )
 endif()
@@ -456,8 +488,9 @@ if(ENABLE_IAP2EMULATION)
   message(STATUS "IAP2 emulation enabled")
 endif()
 
-set(RTLIB rt)
-if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(RTLIB rt)
+else()
   set(RTLIB )
 endif()
 
@@ -484,6 +517,13 @@ if(BUILD_TESTS)
 endif()
 
 # --- 3rd party libs (static)
+if (NOT ANDROID)
+  find_package(OpenSSL REQUIRED)
+else()
+  set(OPENSSL_INCLUDE_DIRECTORY ${CMAKE_SOURCE_DIR}/src/3rd_party-static/openssl/include)
+  set(OPENSSL_LIBS_DIRECTORY ${CMAKE_SOURCE_DIR}/src/3rd_party-static/openssl/x86_64)
+endif()
+
 add_subdirectory(./src/3rd_party-static)
 
 # --- Tools