Merge branch 'master' into development/METROL-748

rdkcentral · Aug 10, 2023 · 4cc545c · 4cc545c
2 parents f4ff71f + e33b589
commit 4cc545c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Compositor/test/CMakeLists.txt b/Compositor/test/CMakeLists.txt
@@ -15,5 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_subdirectory(compositortest)
+option(BUILD_COMPOSITOR_TEST_CLIENT "Build compositor test client" OFF)
+option(BUILD_COMPOSITOR_TEST_SERVER "Build compositor test server" OFF)
+
+if (BUILD_COMPOSITOR_TEST_CLIENT)
+    add_subdirectory(compositortest)
+endif()
+if (BUILD_COMPOSITOR_TEST_SERVER)
 add_subdirectory(compositorserver)
+endif()
+
+
diff --git a/Svalbard/CryptographyRPC.cpp b/Svalbard/CryptographyRPC.cpp
@@ -113,7 +113,7 @@ namespace Plugin {
 
             config.FromString(framework->ConfigLine());
 
-            _cryptography = Cryptography::ICryptography::Instance("");
+            _cryptography = Exchange::ICryptography::Instance("");
 
             Core::ProxyType<RPC::InvokeServer> server = Core::ProxyType<RPC::InvokeServer>::Create(&Core::IWorkerPool::Instance());
 
@@ -136,11 +136,11 @@ namespace Plugin {
 
         BEGIN_INTERFACE_MAP(CryptographyImplementation)
             INTERFACE_ENTRY(Exchange::IConfiguration)
-            INTERFACE_AGGREGATE(Cryptography::ICryptography, _cryptography)
+            INTERFACE_AGGREGATE(Exchange::ICryptography, _cryptography)
         END_INTERFACE_MAP
 
     private:
-        Cryptography::ICryptography* _cryptography;
+        Exchange::ICryptography* _cryptography;
         ExternalAccess* _rpcLink;
     };