Merge pull request #885 from eshcherb/roctracer-hip-frontend-190129

roctracer-proto pkg-config fix to includedir

[ROCm/clr commit: d3e0cad948]

projects/clr/hipamd/CMakeLists.txt

@@ -158,7 +158,7 @@ if(USE_PROF_API EQUAL 1)
         find_package(PkgConfig)
         pkg_check_modules(ROCTRACERPROTO QUIET roctracer-proto)
         if(ROCTRACERPROTO_FOUND EQUAL 1)
-            pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto prefix)
+            pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto includedir)
         else()
             set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext)
         endif()

projects/clr/hipamd/include/hip/hcc_detail/hip_prof_api.h

@@ -195,8 +195,8 @@ class api_callbacks_table_t {
  public:
   typedef void* act_t;
   typedef void* fun_t;
-  bool set_activity(uint32_t id, act_t fun, void* arg) { return true; }
-  bool set_callback(uint32_t id, fun_t fun, void* arg) { return true; }
+  bool set_activity(uint32_t id, act_t fun, void* arg) { return false; }
+  bool set_callback(uint32_t id, fun_t fun, void* arg) { return false; }
 };
 
 #endif