Reverted entservices modules to 1.0.9

Author: arjunbinu

CHANGELOG.md

@@ -4,39 +4,9 @@ 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)
-
-> 23 April 2025
-
-- RDK-55554 Update return type [`#60`](https://github.com/rdkcentral/entservices-inputoutput/pull/60)
-- RDKEMW-3207 [OSCR SCAN] RDKE - entservices-testframework [`#61`](https://github.com/rdkcentral/entservices-inputoutput/pull/61)
-- RDK-55554 - Changelog updates for 1.0.10 [`36cea31`](https://github.com/rdkcentral/entservices-inputoutput/commit/36cea315c7be83b561012ea219fb78cbdd60f5d5)
-- Modifying L1-tests.yml L2-tests.yml [`fd0a678`](https://github.com/rdkcentral/entservices-inputoutput/commit/fd0a6783526fa0dd6d6541b31aeef4c2d8272fb5)
-- Merge tag '1.0.9' into develop [`668cc7c`](https://github.com/rdkcentral/entservices-inputoutput/commit/668cc7ce09864ac16e6c609cabbfcf94ae16faba)
-
 #### [1.0.9](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.8...1.0.9)
 
-> 15 April 2025
-
 - RDK-57093: Resolved the compilation error [`#55`](https://github.com/rdkcentral/entservices-inputoutput/pull/55)
-- 1.0.9 release change log updates [`fb8eb3c`](https://github.com/rdkcentral/entservices-inputoutput/commit/fb8eb3c4fe58d2165dbab6d57d8eab46673ed1f3)
 - Merge tag '1.0.8' into develop [`fe37f21`](https://github.com/rdkcentral/entservices-inputoutput/commit/fe37f210ddbf3e698fccc454fd7593e7fb6e4a9d)
 
 #### [1.0.8](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.7...1.0.8)

HdcpProfile/CMakeLists.txt

@@ -17,7 +17,6 @@
 
 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")
@@ -33,42 +32,20 @@ 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(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM)
+target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM)
 else ()
-target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}Protocols::${NAMESPACE}Protocols)
+target_link_libraries(${MODULE_NAME} 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")
@@ -81,17 +58,16 @@ if (RDK_SERVICE_L2_TEST)
     endif (TESTMOCKLIB_LIBRARIES)
 endif()
 
-
-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)
+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)
 
 
 set_source_files_properties(HdcpProfile.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
 
-target_link_libraries(${PLUGIN_IMPLEMENTATION} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${DS_LIBRARIES})
+target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES} ${DS_LIBRARIES} )
 
-install(TARGETS ${PLUGIN_IMPLEMENTATION}
+install(TARGETS ${MODULE_NAME}
         DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
 
 write_config(${PLUGIN_NAME})

HdcpProfile/HdcpProfile.conf.in

@@ -2,11 +2,3 @@ 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,12 +5,3 @@ 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)