Supports Android-like build on desktop (#1529)

Such environment is set up when one wants to run unit tests in
Android Studio. Unit tests are run on host (not in emulator),
but JNI and even many Android's core API like Context are still
provided by Robolectric. On the other hand typical Android C++
headers like <android/log.h> are not accessible.

This patch adds checks for macro ANDROID_HOST which is defined
on such enviroment.

Relates-To: HERESDK-1085

Signed-off-by: Yauheni Khnykin <[email protected]>

Author: Hsilgos

olp-cpp-sdk-core/include/olp/core/context/Context.h

@@ -26,7 +26,7 @@
 
 #include <olp/core/CoreApi.h>
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
 #include <jni.h>
 #endif
 
@@ -98,7 +98,7 @@ class CORE_API Context {
      */
     Scope();
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
     /**
      * @brief Creates the `Scope` instance.
      *
@@ -147,13 +147,13 @@ class CORE_API Context {
   /// deinitialize the Context
   static void deinit();
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
   /// initialize the Context
   static void init(JavaVM* vm, jobject application);
 #endif
 
  public:
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
   /**
    * @brief Gets the `JavaVM` object.
    *

olp-cpp-sdk-core/src/context/Context.cpp

@@ -29,7 +29,7 @@
 #include <windows.h>
 #undef min
 #undef max
-#elif defined(ANDROID)
+#elif defined(ANDROID) || defined(ANDROID_HOST)
 #include <jni.h>
 #endif
 
@@ -73,7 +73,7 @@ void Context::addInitializeCallbacks(InitializedCallback initCallback,
 
 void Context::init() {
   auto cd = Instance();
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
   cd->java_vm = nullptr;
 #else
   (void)cd;
@@ -82,7 +82,7 @@ void Context::init() {
 }
 
 void Context::deinit() {
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
   auto cd = Instance();
   // Release the global reference of Context.
   // Technically not needed if we took the application context,
@@ -92,7 +92,12 @@ void Context::deinit() {
     bool attached = false;
     if (cd->java_vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) !=
         JNI_OK) {
-      if (cd->java_vm->AttachCurrentThread(&env, nullptr) != JNI_OK) {
+#if defined(ANDROID)
+      auto envPtr = &env;
+#else
+      auto envPtr = reinterpret_cast<void**>(&env);
+#endif
+      if (cd->java_vm->AttachCurrentThread(envPtr, nullptr) != JNI_OK) {
         env = nullptr;
       } else {
         attached = true;
@@ -111,7 +116,7 @@ void Context::deinit() {
   deinitialize();
 }
 
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(ANDROID_HOST)
 void Context::init(JavaVM* vm, jobject context) {
   auto cd = Instance();
   cd->java_vm = vm;
@@ -189,7 +194,7 @@ Context::Scope::Scope() : m_cd(Instance()) {
     Context::init();
   }
 }
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
 /// see Context::init()
 Context::Scope::Scope(JavaVM* vm, jobject application) : m_cd(Instance()) {
   std::lock_guard<std::mutex> lock(m_cd->context_mutex);

olp-cpp-sdk-core/src/context/ContextInternal.h

@@ -29,9 +29,11 @@
 #include <string>
 #endif
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
 #include <jni.h>
-#elif defined(__APPLE__)
+#endif
+
+#if defined(__APPLE__)
 #include <olp/core/context/EnterBackgroundSubscriber.h>
 #endif
 
@@ -45,7 +47,7 @@ struct ContextData {
 
   std::mutex context_mutex;
   size_t context_instance_counter = 0;
-#ifdef ANDROID
+#if defined(ANDROID) || defined(ANDROID_HOST)
   JavaVM* java_vm = nullptr;
   jobject context = nullptr;
 #elif defined(__APPLE__)

olp-cpp-sdk-core/src/http/android/NetworkAndroid.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#ifdef __ANDROID__
+#if defined(__ANDROID__) || defined(ANDROID_HOST)
 
 #include <condition_variable>
 #include <future>

olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp

@@ -54,7 +54,7 @@ namespace {
 
 const char* kLogTag = "CURL";
 
-#ifdef OLP_SDK_ENABLE_ANDROID_CURL
+#if defined(OLP_SDK_ENABLE_ANDROID_CURL) && !defined(ANDROID_HOST)
 const auto kCurlAndroidCaBundleFolder = "/system/etc/security/cacerts";
 
 #ifdef OLP_SDK_USE_MD5_CERT_LOOKUP
@@ -251,7 +251,7 @@ void GetTrafficData(CURL* handle, uint64_t& upload_bytes,
 CURLcode SetCaBundlePaths(CURL* handle) {
   OLP_SDK_CORE_UNUSED(handle);
 
-#ifdef OLP_SDK_ENABLE_ANDROID_CURL
+#if defined(OLP_SDK_ENABLE_ANDROID_CURL) && !defined(ANDROID_HOST)
   // FIXME: We could disable this lookup as it won't work on most devices
   //  (probably all of them) since OpenSSL still will be trying to find
   //  certificate with SHA1 lookup
@@ -331,7 +331,7 @@ NetworkCurl::NetworkCurl(NetworkInitializationSettings settings)
 #endif
 
   std::string ca_bundle_path;
-#ifdef OLP_SDK_ENABLE_ANDROID_CURL
+#if defined(OLP_SDK_ENABLE_ANDROID_CURL) && !defined(ANDROID_HOST)
   ca_bundle_path = kCurlAndroidCaBundleFolder;
 #elif OLP_SDK_NETWORK_HAS_OPENSSL
   ca_bundle_path = CaBundlePath();

olp-cpp-sdk-core/src/http/curl/NetworkCurl.h

@@ -33,7 +33,7 @@
 
 #include <boost/optional.hpp>
 
-#ifdef OLP_SDK_ENABLE_ANDROID_CURL
+#if defined(OLP_SDK_ENABLE_ANDROID_CURL) && !defined(ANDROID_HOST)
 #ifdef OLP_SDK_NETWORK_HAS_OPENSSL
 #include <openssl/ossl_typ.h>