RDKEMW-18412: integrate common helpers

.github/workflows/L1-tests.yml

@@ -9,7 +9,7 @@ on:
         type: string
     secrets:
       RDKCM_RDKE:
-        required: true
+        required: true 
 
 env:
   BUILD_TYPE: Debug
@@ -123,7 +123,7 @@ jobs:
         with:
           repository: rdkcentral/entservices-testframework
           path: entservices-testframework
-          ref: 1.0.1
+          ref: feature/helpers_v1
 
       - name: Checkout entservices-connectivity
         if: ${{ inputs.caller_source == 'local' }}
@@ -137,7 +137,7 @@ jobs:
         with:
           repository: rdkcentral/entservices-connectivity
           path: entservices-connectivity
-          ref: develop
+          ref: feature/RDKEMW-16743
 
       - name: Checkout googletest
         if: steps.cache.outputs.cache-hit != 'true'
@@ -330,6 +330,28 @@ jobs:
           &&
           cmake --install build/googletest
 
+      - name: Checkout entservices-helpers
+        uses: actions/checkout@v3
+        with:
+          repository: rdkcentral/entservices-helpers
+          path: entservices-helpers
+          ref: feature/RDKEMW-16743
+
+      - 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
+          &&
+          cmake --build build/entservices-helpers
+          &&
+          cmake --install build/entservices-helpers
+
       - name: Build mocks
         run: >
           cmake
@@ -360,7 +382,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-connectivity/helpers
+          -I $GITHUB_WORKSPACE/entservices-helpers/helpers
           -I $GITHUB_WORKSPACE/Thunder/Source
           -I $GITHUB_WORKSPACE/Thunder/Source/core
           -I $GITHUB_WORKSPACE/install/usr/include
@@ -497,7 +519,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-connectivity/helpers
+          -I $GITHUB_WORKSPACE/entservices-helpers/helpers
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests
           -I $GITHUB_WORKSPACE/Thunder/Source
           -I $GITHUB_WORKSPACE/Thunder/Source/core

Bluetooth/CMakeLists.txt

@@ -26,6 +26,7 @@ set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 set(PLUGIN_BLUETOOTH_STARTUPORDER "" CACHE STRING "To configure startup order of Bluetooth plugin")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(${NAMESPACE}Helpers REQUIRED)
 
 set(BLUETOOTH_PLUGIN_SOURCES
         Bluetooth.cpp
@@ -67,8 +68,11 @@ if(BTMGR_FOUND)
 endif(BTMGR_FOUND)
 
 find_package(IARMBus)
-target_include_directories(${MODULE_NAME} PRIVATE ../helpers ${IARMBUS_INCLUDE_DIRS})
-target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins ${IARMBUS_LIBRARIES})
+target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS})
+target_link_libraries(${MODULE_NAME} PRIVATE
+        ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+        ${IARMBUS_LIBRARIES}
+        ${NAMESPACE}::${NAMESPACE}Helpers)
 
 if (NOT RDK_SERVICES_L1_TEST)
     target_compile_options(${MODULE_NAME} PRIVATE -Wno-error=deprecated)

Tests/L1Tests/CMakeLists.txt

@@ -32,7 +32,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 @@ macro(add_plugin_test plugin_name test_files)
 endmacro()
 
 # PLUGIN_BLUETOOTH
-set (BLUETOOTH_INC ${CMAKE_SOURCE_DIR}/../entservices-connectivity/Bluetooth ${CMAKE_SOURCE_DIR}/../entservices-connectivity/helpers)
+set (BLUETOOTH_INC ${CMAKE_SOURCE_DIR}/../entservices-connectivity/Bluetooth ${CMAKE_SOURCE_DIR}/../entservices-helpers/helpers)
 set (BLUETOOTH_LIBS ${NAMESPACE}Bluetooth)
 add_plugin_test_ex(PLUGIN_BLUETOOTH tests/test_Bluetooth.cpp "${BLUETOOTH_INC}" "${BLUETOOTH_LIBS}")
 

build_dependencies.sh

@@ -33,6 +33,10 @@ git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git
 
 git clone --branch develop https://github.com/rdkcentral/entservices-apis.git
 
+cd ..
+git clone --branch feature/RDKEMW-16743 https://github.com/rdkcentral/entservices-helpers.git
+cd "$GITHUB_WORKSPACE"
+
 git clone --branch 1.0.1 https://github.com/rdkcentral/entservices-testframework.git
 
 ############################
@@ -94,6 +98,16 @@ cmake -G Ninja -S entservices-apis  -B build/entservices-apis \
 cmake --build build/entservices-apis --target install
 
 
+##############################
+# 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"
+cmake --build build/entservices-helpers --target install
+
 
 ############################
 # generating extrnal headers

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)