Added x86 builds for casablanca on Android

Author: ras0219-msft

Build_android/configure.sh

@@ -237,7 +237,7 @@ then
 	    -DANDROID_GOLD_LINKER=OFF \
 	    -DCMAKE_BUILD_TYPE=Debug \
 	    -DANDROID_NDK="${ANDROID_NDK}"
-	make -j 3
+	make -j 1
     )
 
     (
@@ -253,7 +253,39 @@ then
 	    -DANDROID_NATIVE_API_LEVEL=android-9 \
 	    -DANDROID_GOLD_LINKER=OFF \
 	    -DCMAKE_BUILD_TYPE=Release
-	make -j 3
+	make -j 1
+    )
+
+    (
+	mkdir -p build.x86.debug
+	cd build.x86.debug
+	cmake "$DIR/../Release/" \
+	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
+	    -DANDROID_ABI=x86 \
+	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.4 \
+	    -DANDROID_STL=none \
+	    -DANDROID_STL_FORCE_FEATURES=ON \
+            -DANDROID_NATIVE_API_LEVEL=android-9 \
+	    -DANDROID_GOLD_LINKER=OFF \
+	    -DCMAKE_BUILD_TYPE=Debug \
+	    -DANDROID_NDK="${ANDROID_NDK}"
+	make -j 1
+    )
+
+    (
+	mkdir -p build.x86.release
+	cd build.x86.release
+	cmake "$DIR/../Release/" \
+	    -DCMAKE_TOOLCHAIN_FILE=../android-cmake/android.toolchain.cmake \
+	    -DANDROID_ABI=x86 \
+	    -DANDROID_TOOLCHAIN_NAME=x86-clang3.4 \
+	    -DANDROID_STL=none \
+	    -DANDROID_STL_FORCE_FEATURES=ON \
+	    -DANDROID_NDK="${ANDROID_NDK}" \
+	    -DANDROID_NATIVE_API_LEVEL=android-9 \
+	    -DANDROID_GOLD_LINKER=OFF \
+	    -DCMAKE_BUILD_TYPE=Release
+	make -j 1
     )
 )
 fi

Release/CMakeLists.txt

@@ -20,7 +20,7 @@ if(IOS)
     "${IOS_SOURCE_DIR}/openssl/lib/libssl.a"
     )
 
-  # The cxx_flags must be set here, because the ios-cmake toolchain file unfortunately sets "-headerpad_max_install_names" which is not a valid clang flag.
+  # The cxx_flags must be reset here, because the ios-cmake toolchain file unfortunately sets "-headerpad_max_install_names" which is not a valid clang flag.
   set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden")
 
   set(BUILD_SHARED_LIBS OFF)
@@ -29,18 +29,36 @@ if(IOS)
 elseif(ANDROID)
   set(Boost_COMPILER "-clang")
   set(Boost_USE_STATIC_LIBS ON)
-  set(BOOST_ROOT "${CMAKE_BINARY_DIR}/../Boost-for-Android/build")
-  set(BOOST_LIBRARYDIR "${CMAKE_BINARY_DIR}/../Boost-for-Android/build/lib")
+  if(ARM)
+    set(BOOST_ROOT "${CMAKE_BINARY_DIR}/../Boost-for-Android/build")
+    set(BOOST_LIBRARYDIR "${CMAKE_BINARY_DIR}/../Boost-for-Android/build/lib")
+  else()
+    set(BOOST_ROOT "${CMAKE_BINARY_DIR}/../Boost-for-Android-x86/build")
+    set(BOOST_LIBRARYDIR "${CMAKE_BINARY_DIR}/../Boost-for-Android-x86/build/lib")
+  endif()
   find_host_package(Boost 1.55 EXACT REQUIRED COMPONENTS random system thread locale filesystem chrono atomic)
 
   # find_package(Threads REQUIRED)
   set(OPENSSL_FOUND 1)
-  set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/include")
-  set(OPENSSL_LIBRARIES
-    "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libssl.a"
-    "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libcrypto.a"
-    )
-  set(LIBCXX_STL "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/thumb/libgnustl_static.a")
+  if(ARM)
+    set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/include")
+    set(OPENSSL_LIBRARIES
+      "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libssl.a"
+      "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libcrypto.a"
+      )
+  else()
+    set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/x86/include")
+    set(OPENSSL_LIBRARIES
+      "${CMAKE_BINARY_DIR}/../openssl/x86/lib/libssl.a"
+      "${CMAKE_BINARY_DIR}/../openssl/x86/lib/libcrypto.a"
+      )
+  endif()
+
+  if(ARM)
+    set(LIBCXX_STL "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/thumb/libgnustl_static.a")
+  else()
+    set(LIBCXX_STL "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/thumb/libgnustl_static.a")
+  endif()
   set(ANDROID_STL_FLAGS
 #    pthread
     ${LIBCXX_STL}
@@ -52,7 +70,7 @@ elseif(ANDROID)
 #    -nodefaultlibs
     )
 
-  set(BUILD_SHARED_LIBS ON)
+  option(BUILD_SHARED_LIBS "Build shared Libraries." OFF)
   set(BUILD_SAMPLES OFF)
   option(BUILD_TESTS "Build tests." ON)
 elseif(UNIX) # This includes OSX

Release/src/websockets/client/ws_client.cpp

@@ -94,12 +94,11 @@ namespace details
 // Utility function to build up error string based on error code and location.
 static std::string build_error_msg(const std::error_code &ec, const std::string &location)
 {
-    std::string msg(location);
-    msg.append(": ");
-    msg.append(std::to_string(ec.value()));
-    msg.append(": ");
-    msg.append(ec.message());
-    return msg;
+    std::stringstream ss;
+    ss << location
+       << ": " << ec.value()
+       << ": " << ec.message();
+    return ss.str();
 }
 
 static utility::string_t g_subProtocolHeader(_XPLATSTR("Sec-WebSocket-Protocol"));

Release/tests/common/TestRunner/CMakeLists.txt

@@ -10,7 +10,7 @@ set(TR_SOURCES
 
 add_definitions(-DDESKTOP_TEST_RUNNER)
 
-if(NOT IOS)
+if(NOT IOS AND NOT ANDROID)
   if(BUILD_SHARED_LIBS)
     add_executable(test_runner
       test_runner.cpp

Release/tests/functional/http/utilities/test_http_server.cpp

@@ -494,7 +494,7 @@ class _test_http_server
     typename web::http::experimental::listener::http_listener m_listener;
     pplx::extensibility::critical_section_t m_lock;
     std::vector<pplx::task_completion_event<test_request*>> m_requests;
-    std::atomic<unsigned long long> m_last_request_id;
+    std::atomic<unsigned long> m_last_request_id;
 
     std::unordered_map<unsigned long long, web::http::http_request> m_responding_requests;