Merge branch 'pstl' into erfan_merge

Author: Erfan-Ahmadi

.gitignore

@@ -16,6 +16,7 @@
 # CEGUI's downloaded dependencies on Windows
 3rdparty/CEGUI/cegui-deps-0.8.x-src.zip
 # usually where people build
+android_build/*
 build*/*
 # default install paths
 install/*

.gitmodules

@@ -86,3 +86,9 @@
 [submodule "3rdparty/nbl_spirv_cross"]
 	path = 3rdparty/nbl_spirv_cross
 	url = https://github.com/devshgraphicsprogramming/SPIRV-Cross.git
+[submodule "3rdparty/pstl/oneTBB"]
+	path = 3rdparty/pstl/oneTBB
+	url = https://github.com/Devsh-Graphics-Programming/oneTBB.git
+[submodule "3rdparty/pstl/oneDPL/oneDPL"]
+	path = 3rdparty/pstl/oneDPL/oneDPL
+	url = https://github.com/Devsh-Graphics-Programming/oneDPL.git

3rdparty/CMakeLists.txt

@@ -31,6 +31,8 @@ if(NBL_UPDATE_GIT_SUBMODULE)
 	update_git_submodule(./portable-file-dialogs)
 	update_git_submodule(./simdjson)
 	update_git_submodule(./glTFSampleModels)
+	update_git_submodule(./pstl/oneTBB)
+	update_git_submodule(./pstl/oneDPL/oneDPL)
 endif()
 
 # simdjson
@@ -62,6 +64,10 @@ if(DEFINED ENV{VULKAN_SDK})
     target_include_directories(volk_headers INTERFACE "$ENV{VULKAN_SDK}/include")
 endif()
 
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	add_subdirectory(pstl pstl)
+endif()
+
 # SDL2
 if (NBL_COMPILE_WITH_SDL2)
 	set(SDL_STATIC_ENABLED_BY_DEFAULT ON)

3rdparty/openssl/CMakeLists.txt

@@ -57,7 +57,6 @@ elseif(ANDROID) # cross-compile
 		# ATTENTION - it used to work but ENV variable doesn't work while building https://cmake.org/cmake/help/latest/command/set.html#set-environment-variable, TODO check after changes one more time
 		add_custom_command(
 			OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/lib/libcrypto.a" "${CMAKE_CURRENT_BINARY_DIR}/build/lib/libssl.a"
-			COMMAND make clean
 			# not sure if linux-generic64 is right (https://stackoverflow.com/questions/26779531/openssl-for-android-x86-64-and-mips64)
 			# but android-x86_64 is not even recognized (should be according to this https://github.com/openssl/openssl/blob/master/NOTES-ANDROID.md)
 			COMMAND "${PERL_EXECUTABLE}" "${_COPY_BIN_SOURCE_}/Configure" linux-generic64 no-asm no-shared -D__ANDROID_API__=${ANDROID_API_LEVEL} --openssldir=${CMAKE_CURRENT_BINARY_DIR}/build
@@ -120,4 +119,4 @@ else()
 		"${CMAKE_CURRENT_BINARY_DIR}/build/lib/libcrypto.a" 
 		"${CMAKE_CURRENT_BINARY_DIR}/build/lib/libssl.a"
 	)
-endif()
+endif()

3rdparty/pstl/CMakeLists.txt

@@ -0,0 +1,55 @@
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # only non-multi-generators and clang supported
+	get_filename_component(CCBD_ABSOLUTE "${CMAKE_CURRENT_BINARY_DIR}" ABSOLUTE)
+
+	set(TBB_INSTALL_VARS ON CACHE BOOL "" FORCE)
+	set(TBB_TEST OFF CACHE BOOL "" FORCE)
+	set(TBB_STRICT ON CACHE BOOL "" FORCE)
+	set(PREVIOUS_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+	set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+	set(TBB_SANITIZE "" CACHE STRING "" FORCE)
+	add_subdirectory(oneTBB oneTBB)
+	
+	if(PREVIOUS_BUILD_SHARED_LIBS)
+		set(BUILD_SHARED_LIBS ${PREVIOUS_BUILD_SHARED_LIBS} CACHE BOOL "" FORCE)
+	else()
+		unset(BUILD_SHARED_LIBS CACHE)
+	endif()
+	
+	set(ONETBB_BUILD ${CCBD_ABSOLUTE}/oneTBB)
+	set(ONETBB_INSTALL_DIR ${ONETBB_BUILD}/install CACHE STRING "oneTBB install directory" FORCE)
+	
+	add_custom_target(onetbb_build 
+		COMMAND ${CMAKE_COMMAND} --install ${ONETBB_BUILD} --component devel -v --config $<CONFIG> --prefix ${ONETBB_INSTALL_DIR}
+		COMMAND ${CMAKE_COMMAND} --install ${ONETBB_BUILD} --component runtime -v --config $<CONFIG> --prefix ${ONETBB_INSTALL_DIR}
+		DEPENDS tbb tbbmalloc tbbmalloc_proxy
+		COMMENT "Building oneTBB..."
+	)
+	
+	set(ONEDPL_BUILD ${CCBD_ABSOLUTE}/oneDPL/build)
+	set(ONEDPL_INSTALL_DIR ${ONEDPL_BUILD}/install CACHE STRING "oneDPL install directory" FORCE)
+	
+	set(CMAKE_ARGS_ONEDPL 
+		-DCMAKE_BUILD_TYPE:STRING=$<CONFIG>
+		-DONETBB_INSTALL_DIR:PATH=${ONETBB_INSTALL_DIR}
+	)
+	
+	if(ANDROID)
+		list(APPEND CMAKE_ARGS_ONEDPL 
+			-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
+			-DANDROID_ABI:STRING=${ANDROID_ABI}
+			-DANDROID_PLATFORM:STRING=${ANDROID_PLATFORM}
+		)
+	endif()
+
+	ExternalProject_Add(oneDPL
+		SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/oneDPL
+		BINARY_DIR ${ONEDPL_BUILD}
+		CMAKE_ARGS ${CMAKE_ARGS_ONEDPL}
+		BUILD_COMMAND cmake --build ${ONEDPL_BUILD} --target build-all
+		INSTALL_COMMAND cmake --install ${ONEDPL_BUILD} --prefix ${ONEDPL_INSTALL_DIR}
+		USES_TERMINAL_BUILD 1
+		COMMENT "Building oneDPL..."
+	)
+	
+	add_dependencies(oneDPL onetbb_build)
+endif()

3rdparty/pstl/oneDPL/CMakeLists.txt

@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.20)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/toolchains/android/build.cmake)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	if(NOT DEFINED ONETBB_INSTALL_DIR)
+		message(FATAL_ERROR "oneDPL submodule requires valid ONETBB_INSTALL_DIR!")
+	endif()
+	
+	set(TBB_DIR ${ONETBB_INSTALL_DIR}/lib/cmake/TBB CACHE INTERNAL "" FORCE)
+	set(ONEDPL_BACKEND tbb CACHE STRING "" FORCE)
+	add_subdirectory(oneDPL oneDPL)
+
+	if(ANDROID)
+		add_compile_options(
+			$<$<CONFIG:DEBUG>:-glldb>
+		)
+	endif()
+endif()

3rdparty/pstl/oneDPL/oneDPL

@@ -7,188 +7,9 @@ cmake_minimum_required(VERSION 3.20)
 cmake_policy(SET CMP0072 OLD) #not yet, would need to get pointers to all OpenGL functions
 set(OpenGL_GL_PREFERENCE LEGACY)
 #cmake_policy(SET CMP )
-option(NBL_BUILD_ANDROID "Build for Android?" OFF)
 
-if(DEFINED CMAKE_TOOLCHAIN_FILE) # TODO - validate paths due to CMake path-policy (errors when no path passed in)
-	cmake_path(GET CMAKE_TOOLCHAIN_FILE FILENAME _NBL_CMAKE_TOOLCHAIN_FILENAME_)
-
-	if(${_NBL_CMAKE_TOOLCHAIN_FILENAME_} STREQUAL "android.toolchain.cmake")
-		message(STATUS "Found Android toolchain! Validating...")
-		
-		set(_NBL_SUPPORTED_NDK_ "android-ndk-r22b") # supported NDK version
-		set(_NBL_SUPPORTED_ABI_ "x86_64")			# supported ABI
-		
-		# quering ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_}/${_NBL_SUPPORTED_NDK_}/build/cmake/android.toolchain.cmake
-		cmake_path(GET CMAKE_TOOLCHAIN_FILE PARENT_PATH _NBL_TOOLCHAIN_NDK_CMAKE_DIRECTORY_)
-		cmake_path(GET _NBL_TOOLCHAIN_NDK_CMAKE_DIRECTORY_ PARENT_PATH _NBL_TOOLCHAIN_NDK_BUILD_DIRECTORY_)
-		cmake_path(GET _NBL_TOOLCHAIN_NDK_BUILD_DIRECTORY_ PARENT_PATH _NBL_TOOLCHAIN_NDK_ROOT_DIRECTORY_)
-		cmake_path(GET _NBL_TOOLCHAIN_NDK_ROOT_DIRECTORY_ PARENT_PATH _NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_)
-		
-		string(LENGTH ${CMAKE_TOOLCHAIN_FILE} _NBL_CMAKE_TOOLCHAIN_FILE_LENGTH_)
-		string(LENGTH ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_} _NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_LENGTH_)
-		math(EXPR _NBL_PARENT_NDK_TO_TOOLCHAIN_FILE_LENGTH_ "${_NBL_CMAKE_TOOLCHAIN_FILE_LENGTH_} - ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_LENGTH_}" OUTPUT_FORMAT DECIMAL)
-		string(SUBSTRING ${CMAKE_TOOLCHAIN_FILE} ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_LENGTH_} ${_NBL_PARENT_NDK_TO_TOOLCHAIN_FILE_LENGTH_} _NBL_PARENT_NDK_TO_TOOLCHAIN_FILEPATH_)
-		
-		if(${_NBL_PARENT_NDK_TO_TOOLCHAIN_FILEPATH_} STREQUAL "/${_NBL_SUPPORTED_NDK_}/build/cmake/android.toolchain.cmake")
-			message(STATUS "Found Android NDK '${_NBL_SUPPORTED_NDK_}' is appropriate!")
-		else()
-			message(FATAL_ERROR "Found Android NDK version isn't appropriate. Use '${_NBL_SUPPORTED_NDK_}'!")
-		endif()
-		
-		if(EXISTS "${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_}/build-tools")
-			if(DEFINED ANDROID_ABI)
-				if(${ANDROID_ABI} STREQUAL ${_NBL_SUPPORTED_ABI_})
-					message(STATUS "Supported '${_NBL_SUPPORTED_ABI_}' ABI!")
-				
-				else()
-					message(FATAL_ERROR "Found '${ANDROID_ABI}' isn't appropriate. Use '${_NBL_SUPPORTED_ABI_}'!")
-				endif()
-			else()
-				message(STATUS "Could not find 'ANDROID_ABI', using supported ABI: '${_NBL_SUPPORTED_ABI_}'")
-				set(ANDROID_ABI ${_NBL_SUPPORTED_ABI_} CACHE INTERNAL "" FORCE)
-			endif()
-		
-			message(STATUS "'${_NBL_SUPPORTED_NDK_}' located in Android SDK path. Building Nabla with Android toolchain!")
-		
-			set(ANDROID_SDK_ROOT_PATH "${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_}")
-			set(ANDROID_NDK_ROOT_PATH ${ANDROID_SDK_ROOT_PATH}/${_NBL_SUPPORTED_NDK_})
-				
-			set(NBL_BUILD_ANDROID ON)
-			set(_NBL_ANDROID_VALIDATED_ ON)
-		else()
-			message(FATAL_ERROR "${_NBL_SUPPORTED_NDK_} must be placed in Android SDK path!")
-		endif()
-	endif()
-	
-	# TODO - another toolchains in future
-
-endif()
-
-if(NBL_BUILD_ANDROID)
-	if(NOT DEFINED _NBL_ANDROID_VALIDATED_)
-		message(FATAL_ERROR "Android toolchain hasn't been validated properly. Pass an appropriate path to CMAKE_TOOLCHAIN_FILE!")
-	endif()
-	
-	if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
-		message(STATUS "Using Linux as a host OS for Android cross-compiling!")
-	elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
-		message(STATUS "Using Windows as a host OS for Android cross-compiling!")
-	else()
-		message(FATAL_ERROR "Current host OS for Android cross-compiling isn't allowed!")
-	endif()
-	
-	# TODO - remove those bellow in future
-	set(_NBL_COMPILE_WITH_OPEN_EXR_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) 		# TODO - check it out
-	set(_NBL_COMPILE_WITH_BAW_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)	# TODO - remove when BAW-v4 is done
-	set(_NBL_COMPILE_WITH_BAW_WRITER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)	# TODO - remove when BAW-v4 is done
-	set(_NBL_COMPILE_WITH_OBJ_LOADER_ ON CACHE BOOL "Off for Android purposes at the moment" FORCE)
-	set(NBL_BUILD_MITSUBA_LOADER OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) 		# TODO - compile/linker errors
-	
-	find_package(Java 1.8)
-	
-	if(DEFINED Java_JAVA_EXECUTABLE)
-		message(STATUS "Found Java executable!: ${Java_JAVA_EXECUTABLE}")
-	else()
-		message(FATAL_ERROR "Could not find java executable for Android build!")
-	endif()
-	
-	string(LENGTH ${Java_JAVA_EXECUTABLE} Java_JAVA_EXECUTABLE_LENGTH)
-	if(MSVC)
-		set(Java_JAVA_EXE_BIN_LENGTH 13)
-	else() 
-		set(Java_JAVA_EXE_BIN_LENGTH 9)
-	endif()
-	math(EXPR JAVA_HOME_LENGTH "${Java_JAVA_EXECUTABLE_LENGTH} - ${Java_JAVA_EXE_BIN_LENGTH}" OUTPUT_FORMAT DECIMAL)
-	string(SUBSTRING ${Java_JAVA_EXECUTABLE} 0 ${JAVA_HOME_LENGTH} JAVA_HOME)
-
-    message(STATUS "Using JAVA_HOME = ${JAVA_HOME}")
-
-    execute_process(COMMAND ${JAVA_HOME}/bin/java -version
-        RESULT_VARIABLE _result
-        OUTPUT_VARIABLE _output
-        ERROR_VARIABLE _output
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_STRIP_TRAILING_WHITESPACE)
-    
-    if(NOT _result AND _output MATCHES "version \"([0-9]+).([0-9]+)")
-        message(STATUS "Java in JAVA_HOME is ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
-    else()
-        message(STATUS "Java in JAVA_HOME is unknown version ${_output} ${_result}")
-    endif()
-
-    #option(STRIP_ANDROID_LIBRARY "Strip the resulting android library" OFF)
-
-    if(NOT ANDROID_PLATFORM)
-        set(ANDROID_PLATFORM "android-25")
-    endif()
-	string(SUBSTRING
-		"${ANDROID_PLATFORM}"
-		8  # length of "android-"
-		-1 # take remainder
-		ANDROID_API_LEVEL
-	)
-    
-    # default to libc++_static as the other options can cause crashes
-    if(NOT ANDROID_STL)
-        set(ANDROID_STL "c++_static")
-    endif()
-
-    # Choose clang if the NDK has both gcc and clang, since gcc sometimes fails
-	# iirc api levels > 21 have only clang available
-    set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "clang")
-
-	#
-	# android-specific utils and build tools
-	#
-    set(ANDROID_BUILD_TOOLS_VERSION "" CACHE STRING "Version of Android build-tools to use instead of the default")
-	# take most recent version of build tools, if not set explicitely
-    if(ANDROID_BUILD_TOOLS_VERSION STREQUAL "")
-        file(GLOB __buildTools RELATIVE "${ANDROID_SDK_ROOT_PATH}/build-tools" "${ANDROID_SDK_ROOT_PATH}/build-tools/*")
-        list(SORT __buildTools)
-
-        list(GET __buildTools -1 ANDROID_BUILD_TOOLS_VERSION)
-
-        unset(__buildTools)
-    endif()
-	set(ANDROID_BUILD_TOOLS "${ANDROID_SDK_ROOT_PATH}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}")
-	set(ANDROID_JAVA_BIN "${JAVA_HOME}")
-	set(ANDROID_JAVA_RT_JAR "${JAVA_HOME}/jre/lib/rt.jar")
-
-	set(ANDROID_APK_TARGET_ID "" CACHE STRING "The Target ID to build the APK for like 'android-99', use <android list targets> to choose another one.")
-    if(ANDROID_APK_TARGET_ID STREQUAL "")
-        # This seems different from the platform we're targetting,
-        # default to the latest available that's greater or equal to our target platform
-        file(GLOB __platforms RELATIVE "${ANDROID_SDK_ROOT_PATH}/platforms" "${ANDROID_SDK_ROOT_PATH}/platforms/*")
-        list(SORT __platforms)
-
-        # In case we don't find one, target the latest platform
-        list(GET __platforms -1 ANDROID_APK_TARGET_ID)
-
-        string(REPLACE "android-" "" __targetPlat "${ANDROID_PLATFORM}")
-
-		# TODO we might want to adjust min version in the future
-        # We require at least android 23 for Activity.requestPermissions
-        if(__targetPlat LESS 23)
-            set(__targetPlat 23)
-        endif()
-
-        foreach( __plat ${__platforms})
-            string(REPLACE "android-" "" __curPlat "${__plat}")
-
-            if(NOT (__curPlat LESS __targetPlat) )
-                set(ANDROID_APK_TARGET_ID "android-${__curPlat}")
-                break()
-            endif()
-        endforeach()
-
-        unset(__platforms)
-        unset(__targetPlat)
-        unset(__curPlat)
-    endif()
-
-    message(STATUS "Using android.jar from platform ${ANDROID_APK_TARGET_ID}")
-	set(ANDROID_JAR "${ANDROID_SDK_ROOT_PATH}/platforms/${ANDROID_APK_TARGET_ID}/android.jar")
-endif()
+include(ExternalProject)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
 project(Nabla LANGUAGES CXX C)
 

3rdparty/pstl/oneTBB

@@ -177,7 +177,7 @@ Contact ***[@devshgraphicsprogramming](https://github.com/devshgraphicsprogrammi
 - **[CMake](https://cmake.org/download/)** 
 - **[MSVC](https://visualstudio.microsoft.com/pl/downloads/)** or **[GCC](https://sourceforge.net/projects/mingw-w64/)**
 - **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home)**
-- **[Perl](https://www.perl.org/get.html)**
+- **[Perl 5.28 executable version](https://www.perl.org/get.html)**
 - **[NASM](https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D)**
 - **[Python 3.8](https://www.python.org/downloads/release/python-380/)** or later
 
@@ -208,20 +208,27 @@ After dealing with *CUDA* installing just install *Optix SKD*.
 **Required:**
 
 - **[Android Studio](https://developer.android.com/studio)**
-- **[NDK r22b](https://developer.android.com/ndk/downloads#stable-downloads)**
-- **[Java 8](https://www.java.com/download/)**
+- **[JDK 8](https://www.java.com/download/)**
 
-The first step is to install Android Studio and Java 8. When done, extract NDK r22b into *Android SDK root directory* usually located at `C:/Users/<your_user>/AppData/Local/AndroidSdk`. If you however can't find it, open Android Studio and go to **File** and **Project Structure** that will show you where your Android SDKs are installed.
+The first step is to install Android Studio and JDK 8. When done, open Android Studio and navigate to **Tools** -> **SDK Manager** -> **System Settings** -> **Android SDK**.
+Select *SDK Platforms* and install proper individual SDK components - install Android version with Android API level you will be targeting. Then switch to *SDK Tools* and make sure to install **Android SDK Build-Tools 32** and **NDK (Side by side)** - it's a *requirement*! Also you must make sure that your **JAVA_HOME** enviroment variable is set to proper JDK installation path.
 
-Now you can begin CMake generating. On Android Build there is an extra optional Ninja generator available. *Important note is that Nabla Android Build has been performed and tested so far on Windows as cross compile OS with **ninja** generator and on Linux as cross compile OS with **makefile** and **ninja** generators.* Before configuring you need to specify toolchain file for cross-compiling by passing path to `android.toolchain.cmake`. You can find it in NDK directory in `build/cmake/android.toolchain.cmake` and according to example of Android SDK root directory path it should look entirely like `C:/Users/<your_user>/AppData/Local/AndroidSdk/android-ndk-r22b/build/cmake/android.toolchain.cmake`.
+Now you can begin CMake'ing. We use **Ninja** generator tools as a generator for building Nabla for Android on both Windows and Linux Host-OSes. *Note that Nabla Android build has been performed and tested so far on Windows as cross compile OS with **Ninja** generator and on Linux as cross compile OS with **Makefile** and **Ninja** generators, but we recommend using **Ninja** for both OSes.* 
+
+Before configuring CMake you must add 2 cache variables:
+
+- **ANDROID_PLATFORM**
+- **ANDROID_ABI**
+
+**ANDROID_PLATFORM** is a target API platform that you pass as `android-x` where `x` is your android API level (you can pass 28 for instance). **ANDROID_ABI** is Application Binary Interface and note, that we support only `x86_64` currently. Those 2 cache variables *must be* specified before CMake configuration. Having done it you can specify toolchain file for cross-compiling by passing path to `android.toolchain.cmake`. You can find it in Android Studio's SDK directory in `ndk/<version>/build/cmake/android.toolchain.cmake`. Basically the entire path should look like this one `C:/Users/<your_user>/AppData/Local/AndroidSdk/ndk/<version>/build/cmake/android.toolchain.cmake`. With all of this feel free to generate.
 
 Having Nabla generated you need to enter build directory, launch the terminal and type `cmake --build . --target Nabla -j4 -v` or if you want build android sample example you would type `cmake --build . --target android_sample_apk -j4 -v`. The android sample example produces *.apk* file you can use for debugging and profiling.
 
-**Note:** each example provided by the engine builds as an executable with non-cross builds and with target of a name called *"a_target"*, in following example above it would be *"android_sample"*. When building cross-compile for android **to produce the APK file you need to add *"_apk"* postfix to the "*a_target"***, because "*a_target*" gets built then as a library.
+**Note:** each example provided by the engine builds as an executable with non-cross builds and with target of a name called `a_target`, in following example above it would be `android_sample`. When building cross-compile for android **to produce the APK file you need to add `_apk` postfix to the `a_target`, because `a_target` gets built then as a library.
 
 #### Chrome Book SDK version
 
-In order for the chromebook to work with the apk you build you need to install the right SDK version. Go to *Tools -> SDK Manager ->System and Settings -> Android SDK* then Select the *SDK Platforms* tab and tick the "Show Packake Details" checkbox in the bottom-right corner. After that select *Android 9.0 (Pie) -> Android SDK Platform 28* and hit "OK".
+In order for the chromebook to work with the apk you build you need to install the right SDK version. Go to **Tools** -> **SDK Manager** -> **System Settings** -> **Android SDK** then select the *SDK Platforms* tab and tick the "Show Packake Details" checkbox in the bottom-right corner. After that select *Android 9.0 (Pie) -> Android SDK Platform 28* and hit "OK".
 
 #### Chrome Book upload