From d8ddb879b61b956d0a7ebd6a181595c9a41a9562 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 7 Oct 2019 17:09:42 -0400
Subject: Switch to afb-helpers library

Remove old afb-helpers submodule usage in favor of library from the
toolchain. Note that json.hpp is no longer shipped with the library,
and is now assumed to be present in the toolchain, which requires a
DEPENDS addition in the recipe to pick it up.

Bug-AGL: SPEC-2855

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I9114b0a0bbe262224a2c12444e589ef7fdb907f5
---
 .gitmodules                         | 3 ---
 afb-helpers                         | 1 -
 conf.d/cmake/config.cmake           | 3 ++-
 src/CMakeLists.txt                  | 3 +--
 src/plugins/CMakeLists.txt          | 4 +---
 src/plugins/VshlCapabilitiesApi.cpp | 5 ++---
 6 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 160000 afb-helpers

diff --git a/.gitmodules b/.gitmodules
index 91b4a80..1b125e4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "app-controller"]
 	path = app-controller
 	url = https://gerrit.automotivelinux.org/gerrit/apps/app-controller-submodule
-[submodule "afb-helpers"]
-	path = afb-helpers
-	url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule
diff --git a/afb-helpers b/afb-helpers
deleted file mode 160000
index fd4fe75..0000000
--- a/afb-helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fd4fe7525aaf737597e004b0a2b7d91bf18c9f11
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index da2ce59..50949cd 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -70,6 +70,7 @@ set (gcc_minimal_version 4.9)
 set (PKG_REQUIRED_LIST
 	json-c
 	afb-daemon
+	afb-helpers
 )
 
 # Prefix path where will be installed the files
@@ -218,4 +219,4 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install
 # This CMake module could be found at the following url:
 # https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module
 # -----------------------------------------------------------
-include(CMakeAfbTemplates)
\ No newline at end of file
+include(CMakeAfbTemplates)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6bc208f..6ca565d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,8 +37,7 @@ PROJECT_TARGET_ADD(vshl-capabilities)
 
     # Library dependencies (include updates automatically)
     TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        afb-helpers
         ctl-utilities
         ${link_libraries})
 
-add_subdirectory("plugins")
\ No newline at end of file
+add_subdirectory("plugins")
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 705b13d..20c13e9 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -91,7 +91,6 @@ PROJECT_TARGET_ADD(vshl-capabilities-api)
 
     # Library dependencies (include updates automatically)
     TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        afb-helpers
         ${GLIB_PKG_LIBRARIES}
         ${link_libraries}
     )
@@ -141,7 +140,6 @@ PROJECT_TARGET_ADD(vshl-capabilities-api)
         )
 
         TARGET_LINK_LIBRARIES(${TARGET_NAME}_Test
-            afb-helpers
             libgtest
             libgmock
             ${GLIB_PKG_LIBRARIES}
@@ -150,4 +148,4 @@ PROJECT_TARGET_ADD(vshl-capabilities-api)
 
         ENABLE_TESTING()
         ADD_TEST(VshlCapabilitiesTest ${TARGET_NAME}_Test)
-    endif()
\ No newline at end of file
+    endif()
diff --git a/src/plugins/VshlCapabilitiesApi.cpp b/src/plugins/VshlCapabilitiesApi.cpp
index c02fb8f..066edd5 100644
--- a/src/plugins/VshlCapabilitiesApi.cpp
+++ b/src/plugins/VshlCapabilitiesApi.cpp
@@ -15,6 +15,7 @@
 #include "VshlCapabilitiesApi.h"
 
 #include <list>
+#include <json.hpp>
 
 #include "afb/AFBApiImpl.h"
 #include "afb/AFBRequestImpl.h"
@@ -23,8 +24,6 @@
 #include "utilities/events/EventRouter.h"
 #include "utilities/logging/Logger.h"
 
-#include "json.hpp"
-
 using namespace std;
 
 CTLP_CAPI_REGISTER("vshlsupport-api");
@@ -408,4 +407,4 @@ CTLP_CAPI(playbackControllerPublish, source, argsJ, eventJ) {
      
     AFB_ReqSuccess(source->request, json_object_new_string("Successfully published playbackcontroller messages."), NULL);
     return 0;
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg