Build ROCr core and image libraries as one shared object

Change-Id: I3a16c1227e7db2e386ab33886965596fa0fb0c87


[ROCm/ROCR-Runtime commit: 0ca0691ca7]

projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/CMakeLists.txt

@@ -31,7 +31,7 @@ cmake_minimum_required(VERSION 3.5.0)
 #
 
 ## Include the cmake_modules utils.cmake
-list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../opensrc/hsa-runtime/cmake_modules" )
+list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake_modules" )
 include ( utils )
 
 # Flag to abort before executing after default initialization of cache variables
@@ -45,7 +45,6 @@ foreach(ITEM IN LISTS FOLDERS)
     list (APPEND LLVM_SEARCH_PATHS "${LLVM_SEARCH_ROOT}/${ITEM}/include/")
 endforeach()
 
-
 if (NOT DEFINED OPENCL_VER)
   set (OPENCL_VER "2.0")
 endif()

projects/rocr-runtime/runtime/hsa-runtime/image/blit_src/create_hsaco_ascii_file.sh

@@ -16,6 +16,9 @@ cat <<EOF
 //  This file is automatically generated during build process, don't modify it
 //==============================================================================
 
+namespace rocr {
+namespace image {
+
 EOF
 
 for file in ocl_blit_object*
@@ -24,6 +27,12 @@ do
     echo -e '\n'
 done
 
+cat <<EOF
+} // namespace image
+} // namespace rocr
+
+EOF
+
 } > "$opencl_blit_file.tmp"
 
 # Move the file atomically into place, so make doesn't get half a file