Update to latest commit

.github/workflows/L1-tests.yml

@@ -125,7 +125,7 @@ jobs:
         with:
           repository: rdkcentral/entservices-testframework
           path: entservices-testframework
-          ref: 1.0.1
+          ref: 1.0.14
 
       - name: Checkout entservices-avinput
         if: ${{ inputs.caller_source == 'local' }}
@@ -330,6 +330,34 @@ jobs:
           &&
           cmake --install build/googletest
 
+      - name: Checkout entservices-helpers
+        uses: actions/checkout@v3
+        with:
+          repository: rdkcentral/entservices-helpers
+          path: entservices-helpers
+          ref: develop
+
+      - name: Build entservices-helpers
+        run: >
+          cmake -G Ninja
+          -S "$GITHUB_WORKSPACE/entservices-helpers"
+          -B build/entservices-helpers
+          -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
+          -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
+          -DUSE_THUNDER_R4=ON
+          -DHIDE_NON_EXTERNAL_SYMBOLS=OFF
+          -DPLUGIN_HELPERS=ON
+          "-DCMAKE_CXX_FLAGS=
+          -I$GITHUB_WORKSPACE/entservices-testframework/Tests/headers
+          -I$GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmbus
+          -I$GITHUB_WORKSPACE/entservices-testframework/Tests/mocks
+          -include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/tr181api.h
+          -include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h"
+          &&
+          cmake --build build/entservices-helpers
+          &&
+          cmake --install build/entservices-helpers
+
       - name: Build mocks
         run: >
           cmake
@@ -359,7 +387,7 @@ jobs:
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/ccec/drivers
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/network
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests
-          -I $GITHUB_WORKSPACE/entservices-avinput/helpers
+          -I $GITHUB_WORKSPACE/entservices-helpers/helpers
           -I $GITHUB_WORKSPACE/install/usr/include
           -I ./usr/include/libdrm
           -include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/devicesettings.h
@@ -487,7 +515,7 @@ jobs:
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/ccec/drivers
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/network
-          -I $GITHUB_WORKSPACE/entservices-avinput/helpers
+          -I $GITHUB_WORKSPACE/entservices-helpers/helpers
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests
           -I $GITHUB_WORKSPACE/Thunder/Source
           -I $GITHUB_WORKSPACE/Thunder/Source/core

.github/workflows/L2-tests.yml

@@ -114,7 +114,7 @@ jobs:
         with:
           repository: rdkcentral/entservices-testframework
           path: entservices-testframework
-          ref: 1.0.1
+          ref: 1.0.14
 
       - name: Checkout googletest
         if: steps.cache.outputs.cache-hit != 'true'
@@ -334,7 +334,7 @@ jobs:
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/ccec/drivers
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/network
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests
-          -I $GITHUB_WORKSPACE/entservices-avinput/helpers
+          -I $GITHUB_WORKSPACE/entservices-helpers/helpers
           -I $GITHUB_WORKSPACE/Thunder/Source
           -I $GITHUB_WORKSPACE/Thunder/Source/core
           -I $GITHUB_WORKSPACE/install/usr/include
@@ -369,6 +369,34 @@ jobs:
           &&
           cmake --install build/mocks
 
+      - name: Checkout entservices-helpers
+        uses: actions/checkout@v3
+        with:
+          repository: rdkcentral/entservices-helpers
+          path: entservices-helpers
+          ref: develop
+
+      - name: Build entservices-helpers
+        run: >
+          cmake -G Ninja
+          -S "$GITHUB_WORKSPACE/entservices-helpers"
+          -B build/entservices-helpers
+          -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
+          -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
+          -DUSE_THUNDER_R4=ON
+          -DHIDE_NON_EXTERNAL_SYMBOLS=OFF
+          -DPLUGIN_HELPERS=ON
+          "-DCMAKE_CXX_FLAGS=
+          -I$GITHUB_WORKSPACE/entservices-testframework/Tests/headers
+          -I$GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmbus
+          -I$GITHUB_WORKSPACE/entservices-testframework/Tests/mocks
+          -include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/tr181api.h
+          -include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h"
+          &&
+          cmake --build build/entservices-helpers
+          &&
+          cmake --install build/entservices-helpers
+
       - name: Build entservices-deviceanddisplay
         run: >
           cmake
@@ -553,8 +581,7 @@ jobs:
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmmgrs-hal
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers/systemservices/proc
-          -I $GITHUB_WORKSPACE/entservices-deviceanddisplay/helpers
-          -I $GITHUB_WORKSPACE/entservices-avinput/helpers
+          -I $GITHUB_WORKSPACE/entservices-helpers/helpers
           -I $GITHUB_WORKSPACE/install/usr/include
           -I $GITHUB_WORKSPACE/install/usr/include/WPEFramework
           -I ./usr/include/libdrm

CHANGELOG.md

@@ -4,9 +4,17 @@ 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.2.5](https://github.com/rdkcentral/entservices-avinput/compare/1.2.4...1.2.5)
+
+- RDKEMW-18401 : Integrate entservices-avinput to common helpers lib [`#25`](https://github.com/rdkcentral/entservices-avinput/pull/25)
+- Merge tag '1.2.4' into develop [`bef62b7`](https://github.com/rdkcentral/entservices-avinput/commit/bef62b72eeb756f971c48f7917c3dd38dd8931fc)
+
 #### [1.2.4](https://github.com/rdkcentral/entservices-avinput/compare/1.2.3...1.2.4)
 
+> 12 May 2026
+
 - RDKEMW-14878: Expose GetARCPortId to IUI through AVInput Plugin [`#12`](https://github.com/rdkcentral/entservices-avinput/pull/12)
+- 1.2.4 release changelog updates [`270c633`](https://github.com/rdkcentral/entservices-avinput/commit/270c6331c92a946434f7663ebd8ea06dcfb4e475)
 - Merge tag '1.2.3' into develop [`2ffa946`](https://github.com/rdkcentral/entservices-avinput/commit/2ffa9461e43b16eba526028251c6e4ce9242988b)
 
 #### [1.2.3](https://github.com/rdkcentral/entservices-avinput/compare/1.2.2...1.2.3)

Tests/L1Tests/CMakeLists.txt

@@ -31,7 +31,7 @@ set (TEST_LIB
     ${NAMESPACE}Plugins::${NAMESPACE}Plugins
 )
 
-set (TEST_INC ../../helpers)
+set (TEST_INC)
 
 #########################################################################################
 # add_plugin_test_ex: Macro to add plugin tests, it will append to TEST_SRC, TEST_INC,
@@ -102,7 +102,7 @@ endmacro()
 
 
 # PLUGIN_AVINPUT
-set (AVINPUT_INC ../../plugin ../../helpers)
+set (AVINPUT_INC ../../plugin ${CMAKE_SOURCE_DIR}/../entservices-helpers/helpers)
 set (AVINPUT_LIBS ${NAMESPACE}AVInput)
 add_plugin_test_ex(PLUGIN_AVINPUT tests/test_AVInput.cpp "${AVINPUT_INC}" "${AVINPUT_LIBS}")
 

Tests/L2Tests/CMakeLists.txt

@@ -58,7 +58,7 @@ endif (MOCKACCESSOR_LIBRARIES)
 
 target_include_directories(
     ${MODULE_NAME} PRIVATE ./
-    ../../helpers
+    ../../../entservices-helpers/helpers
     ../../../entservices-testframework/Tests/mocks
     ../../../entservices-testframework/Tests/mocks/thunder
     ../../../entservices-testframework/Tests/mocks/devicesettings

build_dependencies.sh

@@ -41,7 +41,11 @@ git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git
 
 git clone --branch develop https://github.com/rdkcentral/entservices-apis.git
 
-git clone --branch 1.0.1 https://github.com/rdkcentral/entservices-testframework.git
+cd ..
+git clone --branch develop https://github.com/rdkcentral/entservices-helpers.git
+cd "$GITHUB_WORKSPACE"
+
+git clone --branch 1.0.14 https://github.com/rdkcentral/entservices-testframework.git
 
 ############################
 # Build Thunder-Tools
@@ -103,7 +107,7 @@ cmake --build build/entservices-apis --target install
 
 
 
-############################
+#############################
 # generating external headers for AVInput plugin
 cd $GITHUB_WORKSPACE
 cd entservices-testframework/Tests
@@ -128,9 +132,24 @@ echo "Creating required IARM Bus headers"
 touch rdk/iarmbus/libIARM.h
 touch rdk/iarmbus/libIBus.h
 touch rdk/iarmbus/libIBusDaemon.h
+touch tr181api.h
 echo "files created successfully"
 echo "======================================================================================"
 
+cd $GITHUB_WORKSPACE
+# Build entservices-helpers
+echo "======================================================================================"
+echo "building entservices-helpers"
+cmake -G Ninja -S ../entservices-helpers -B build/entservices-helpers \
+    -DEXCEPTIONS_ENABLE=ON \
+    -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" \
+    -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+    -DPLUGIN_HELPERS=ON \
+    "-DCMAKE_CXX_FLAGS=-I$GITHUB_WORKSPACE/entservices-testframework/Tests/mocks -I$GITHUB_WORKSPACE/entservices-testframework/Tests/headers -I$GITHUB_WORKSPACE/entservices-testframework/Tests/headers/rdk/iarmbus -include $GITHUB_WORKSPACE/entservices-testframework/Tests/mocks/Iarm.h "
+cmake --build build/entservices-helpers --target install
+
+
+############################
 cd ../../
 
 ls -la ${GITHUB_WORKSPACE}

cmake/FindWPEFrameworkHelpers.cmake

@@ -0,0 +1,39 @@
+# - Try to find WPEFrameworkHelpers
+# Once done this will define
+#  WPEFrameworkHelpers_FOUND        - System has WPEFrameworkHelpers
+#  WPEFrameworkHelpers_INCLUDE_DIRS - The WPEFrameworkHelpers include directories
+#  WPEFrameworkHelpers_LIBRARIES    - The libraries needed to use WPEFrameworkHelpers
+#
+# Also creates an imported target:
+#  WPEFramework::WPEFrameworkHelpers
+
+find_library(WPEFrameworkHelpers_LIBRARIES
+    NAMES WPEFrameworkHelpers
+    PATH_SUFFIXES wpeframework/plugins)
+
+find_path(WPEFrameworkHelpers_INCLUDE_DIRS
+    NAMES UtilsLogging.h
+    PATH_SUFFIXES wpeframework/helpers)
+
+set(WPEFrameworkHelpers_LIBRARIES
+    ${WPEFrameworkHelpers_LIBRARIES}
+    CACHE PATH "Path to WPEFrameworkHelpers library")
+
+set(WPEFrameworkHelpers_INCLUDE_DIRS ${WPEFrameworkHelpers_INCLUDE_DIRS} CACHE PATH "Path to WPEFrameworkHelpers includes")
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPEFrameworkHelpers DEFAULT_MSG
+    WPEFrameworkHelpers_INCLUDE_DIRS
+    WPEFrameworkHelpers_LIBRARIES)
+
+if(WPEFrameworkHelpers_FOUND AND NOT TARGET WPEFramework::WPEFrameworkHelpers)
+    add_library(WPEFramework::WPEFrameworkHelpers SHARED IMPORTED)
+    set_target_properties(WPEFramework::WPEFrameworkHelpers PROPERTIES
+        IMPORTED_LOCATION             "${WPEFrameworkHelpers_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${WPEFrameworkHelpers_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(
+    WPEFrameworkHelpers_FOUND
+    WPEFrameworkHelpers_INCLUDE_DIRS
+    WPEFrameworkHelpers_LIBRARIES)