Fix test load issue on android emulator (x86)

Running tests on android emulator throws error "unable to load native
library libtestrunner_android.so" due to cannot locate symbol
__tls_get_addr
This is fixed in latest boost asio repository, however the version we are
on still has this bug.
To workaround we have defined BOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION
in cpprest_compat.h however while building the test projects(or an app) this does not
get included before the boost asio ssl.hpp headers. Fix our public http
headers to include this header after other cpprest headers (which will
include cpprest_compat.h)

Author: kavyako

Release/include/cpprest/details/http_server_asio.h

@@ -14,6 +14,9 @@
 
 #pragma once
 
+#include <set>
+#include "pplx/threadpool.h"
+#include "cpprest/details/http_server.h"
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wconversion"
@@ -24,9 +27,6 @@
 #pragma clang diagnostic pop
 #endif
 #include <boost/bind.hpp>
-#include <set>
-#include "pplx/threadpool.h"
-#include "cpprest/details/http_server.h"
 
 namespace web
 {

Release/include/cpprest/http_client.h

@@ -42,16 +42,6 @@ typedef void* native_handle;}}}
 
 #include <memory>
 #include <limits>
-#if !defined(_WIN32) && !defined(__cplusplus_winrt)
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wconversion"
-#endif
-#include "boost/asio/ssl.hpp"
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-#endif
 
 #include "pplx/pplxtasks.h"
 #include "cpprest/http_msg.h"
@@ -67,6 +57,17 @@ typedef void* native_handle;}}}
 
 #include "cpprest/oauth2.h"
 
+#if !defined(_WIN32) && !defined(__cplusplus_winrt)
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wconversion"
+#endif
+#include "boost/asio/ssl.hpp"
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+#endif
+
 /// The web namespace contains functionality common to multiple protocols like HTTP and WebSockets.
 namespace web
 {

Release/include/cpprest/http_listener.h

@@ -29,12 +29,11 @@
 #include <limits>
 #include <functional>
 
+#include "cpprest/http_msg.h"
 #if !defined(_WIN32) && !defined(__cplusplus_winrt)
 #include <boost/asio/ssl.hpp>
 #endif
 
-#include "cpprest/http_msg.h"
-
 #if !defined(_WIN32) || (_WIN32_WINNT >= _WIN32_WINNT_VISTA && !defined(__cplusplus_winrt))
 
 namespace web

Release/src/build/vs14.android/casablanca140.android.vcxproj

@@ -118,13 +118,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
-    <Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.59.0.0\build\native\boost.targets')" />
+    <Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
-    <Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.59.0.0\build\native\boost.targets'))" />
+    <Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
   </Target>
 </Project>