Merge branch 'develop' into feature/RDK-55554_2

Author: hgfell683

.github/workflows/L1-tests.yml

@@ -345,7 +345,7 @@ jobs:
           -DDS_FOUND=ON
           -DHAS_FRONT_PANEL=ON
           -DRDK_SERVICES_L1_TEST=ON
-          -DPLUGIN_HDCPPROFILE=ON
+          -DPLUGIN_HDCPPROFILE=OFF
           -DPLUGIN_HDMICECSOURCE=ON
           -DPLUGIN_HDMICECSINK=ON
           -DUSE_THUNDER_R4=ON
@@ -419,7 +419,7 @@ jobs:
           -DCMAKE_DISABLE_FIND_PACKAGE_CEC=ON
           -DCMAKE_BUILD_TYPE=Debug
           -DDS_FOUND=ON
-          -DPLUGIN_HDCPPROFILE=ON
+          -DPLUGIN_HDCPPROFILE=OFF
           -DPLUGIN_HDMICECSOURCE=ON
           -DPLUGIN_HDMICECSINK=ON
           -DRDK_SERVICES_L1_TEST=ON
@@ -541,40 +541,40 @@ jobs:
           cp -rf $(pwd)/rdkL1TestResults.json $GITHUB_WORKSPACE/rdkL1TestResultsWithValgrind.json &&
           rm -rf $(pwd)/rdkL1TestResults.json
 
-      - name: Generate coverage
-        if: ${{ matrix.coverage == 'with-coverage' && !env.ACT }}
-        run: >
-          cp $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/.lcovrc_l1 ~/.lcovrc
-          &&
-          lcov -c
-          -o coverage.info
-          -d build/entservices-inputoutput
-          &&
-          lcov
-          -r coverage.info
-          '/usr/include/*'
-          '*/build/entservices-inputoutput/_deps/*'
-          '*/install/usr/include/*'
-          '*/Tests/headers/*'
-          '*/Tests/mocks/*'
-          '*/Tests/L1Tests/tests/*'
-          '*/Thunder/*'
-          -o filtered_coverage.info
-          &&
-          genhtml
-          -o coverage
-          -t "entservices-inputoutput coverage"
-          filtered_coverage.info
+      # - name: Generate coverage
+        # if: ${{ matrix.coverage == 'with-coverage' && !env.ACT }}
+        # run: >
+          # cp $GITHUB_WORKSPACE/entservices-testframework/Tests/L1Tests/.lcovrc_l1 ~/.lcovrc
+          # &&
+          # lcov -c
+          # -o coverage.info
+          # -d build/entservices-inputoutput
+          # &&
+          # lcov
+          # -r coverage.info
+          # '/usr/include/*'
+          # '*/build/entservices-inputoutput/_deps/*'
+          # '*/install/usr/include/*'
+          # '*/Tests/headers/*'
+          # '*/Tests/mocks/*'
+          # '*/Tests/L1Tests/tests/*'
+          # '*/Thunder/*'
+          # -o filtered_coverage.info
+          # &&
+          # genhtml
+          # -o coverage
+          # -t "entservices-inputoutput coverage"
+          # filtered_coverage.info
 
-      - name: Upload artifacts
-        if: ${{ !env.ACT }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: artifacts
-          path: |
-            coverage/
-            valgrind_log
-            rdkL1TestResultsWithoutValgrind.json
-            rdkL1TestResultsWithValgrind.json
-          if-no-files-found: warn
+      # - name: Upload artifacts
+        # if: ${{ !env.ACT }}
+        # uses: actions/upload-artifact@v4
+        # with:
+          # name: artifacts
+          # path: |
+            # coverage/
+            # valgrind_log
+            # rdkL1TestResultsWithoutValgrind.json
+            # rdkL1TestResultsWithValgrind.json
+          # if-no-files-found: warn
 

.github/workflows/native_full_build.yml

@@ -0,0 +1,25 @@
+name: Build Component in Native Environment
+
+on:
+  push:
+    branches: [ main, 'sprint/**', 'release/**', develop ]
+  pull_request:
+    branches: [ main, 'sprint/**', 'release/**', topic/RDK*, develop ]
+
+jobs:
+  build-entservices-on-pr:
+    name: Build entservices-inputoutput component in github rdkcentral
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/rdkcentral/docker-rdk-ci:latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: native build
+        run: |
+          sh -x build_dependencies.sh
+          sh -x cov_build.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.RDKCM_RDKE }}

CHANGELOG.md

@@ -4,10 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.0.12](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.11...1.0.12)
+
+- RDKEMW-1014 : Add COM-RPC support to HdcpProfile plugin [`#72`](https://github.com/rdkcentral/entservices-inputoutput/pull/72)
+- RDK-55373:[RDKServices] Coverity integration with middleware component workflow [`#80`](https://github.com/rdkcentral/entservices-inputoutput/pull/80)
+- [RDKEMW-2711] RDKEMW-2748 : Update the Test Coverage [`#75`](https://github.com/rdkcentral/entservices-inputoutput/pull/75)
+- Update Utils.py [`#73`](https://github.com/rdkcentral/entservices-inputoutput/pull/73)
+- Merge tag '1.0.11' into develop [`c86b827`](https://github.com/rdkcentral/entservices-inputoutput/commit/c86b82721e32a4bbc828003d0fd5cf76c77d8cca)
+
 #### [1.0.11](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.10...1.0.11)
 
+> 25 April 2025
+
 - PowerManager Interface file modified [`#62`](https://github.com/rdkcentral/entservices-inputoutput/pull/62)
 - Update TestManager.py for removing frontpanel and hdcpprofile dependencies to execute testcases standalone [`#68`](https://github.com/rdkcentral/entservices-inputoutput/pull/68)
+- 1.0.11 release changelog updates [`85c0153`](https://github.com/rdkcentral/entservices-inputoutput/commit/85c0153a722c521a8707a49758f9df1cd4e4dc59)
 - Merge tag '1.0.10' into develop [`7a54d8c`](https://github.com/rdkcentral/entservices-inputoutput/commit/7a54d8cdb9da6de8071c19c8efdf48e7ec5bba96)
 
 #### [1.0.10](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.9...1.0.10)

HdcpProfile/CMakeLists.txt

@@ -17,6 +17,7 @@
 
 set(PLUGIN_NAME HdcpProfile)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
+set(PLUGIN_IMPLEMENTATION ${MODULE_NAME}Implementation)
 
 set(PLUGIN_HDCPPROFILE_AUTOSTART "false" CACHE STRING "Automatically start HdcpProfile plugin")
 set(PLUGIN_HDCPPROFILE_STARTUPORDER "" CACHE STRING "To configure startup order of HdcpProfile plugin")
@@ -32,20 +33,42 @@ add_library(${MODULE_NAME} SHARED
         HdcpProfile.cpp
         Module.cpp)
 
+
 set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
 target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
 
+
+include_directories(
+        ../helpers)
+
+target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
+
+install(TARGETS ${MODULE_NAME}
+        DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+
+add_library(${PLUGIN_IMPLEMENTATION} SHARED
+        HdcpProfileImplementation.cpp
+        Module.cpp)
+target_link_libraries(${PLUGIN_IMPLEMENTATION}
+        PRIVATE
+        ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
+set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
+        CXX_STANDARD 11
+        CXX_STANDARD_REQUIRED YES)	
+		
+
 if (USE_THUNDER_R4)
-target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM)
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM)
 else ()
-target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Protocols::${NAMESPACE}Protocols)
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}Protocols::${NAMESPACE}Protocols)
 endif (USE_THUNDER_R4)
 
 find_package(DS)
 find_package(IARMBus)
+find_package(CEC)
 
 if (RDK_SERVICE_L2_TEST)
     message ("L2 test Enabled")
@@ -58,16 +81,17 @@ if (RDK_SERVICE_L2_TEST)
     endif (TESTMOCKLIB_LIBRARIES)
 endif()
 
-target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS})
-target_include_directories(${MODULE_NAME} PRIVATE ${DS_INCLUDE_DIRS})
-target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
+
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${IARMBUS_INCLUDE_DIRS})
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ${DS_INCLUDE_DIRS})
+target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ../helpers)
 
 
 set_source_files_properties(HdcpProfile.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
 
-target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${DS_LIBRARIES} )
+target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${DS_LIBRARIES})
 
-install(TARGETS ${MODULE_NAME}
+install(TARGETS ${PLUGIN_IMPLEMENTATION}
         DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
 
 write_config(${PLUGIN_NAME})

HdcpProfile/HdcpProfile.conf.in

@@ -2,3 +2,11 @@ precondition = ["Platform"]
 callsign = "org.rdk.HdcpProfile"
 autostart = "@PLUGIN_HDCPPROFILE_AUTOSTART@"
 startuporder = "@PLUGIN_HDCPPROFILE_STARTUPORDER@"
+
+configuration = JSON()
+rootobject = JSON()
+
+rootobject.add("mode", "@PLUGIN_HDCPPROFILE_MODE@")
+rootobject.add("locator", "lib@[email protected]")
+
+configuration.add("root", rootobject)

HdcpProfile/HdcpProfile.config

@@ -5,3 +5,12 @@ set (callsign "org.rdk.HdcpProfile")
 if(PLUGIN_HDCPPROFILE_STARTUPORDER)
 set (startuporder ${PLUGIN_HDCPPROFILE_STARTUPORDER})
 endif()
+
+map()
+    key(root)
+    map()
+        kv(mode ${PLUGIN_HDCPPROFILE_MODE})
+        kv(locator lib${PLUGIN_IMPLEMENTATION}.so)
+    end()
+end()
+ans(configuration)