From 40a0b16e2e4e8b030473254c2f04b4b377bf76f1 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 7 Oct 2019 16:35:45 -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, and an #include of
sstream to work with newer versions of json.hpp.

Bug-AGL: SPEC-2854

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Iea205048b051a69d5251d295588ce3451efc7e4a
(cherry picked from commit 4b6fce387aa0b175bfb1b30de8d671434918a217)
---
 src/CMakeLists.txt          | 3 +--
 src/plugins/CMakeLists.txt  | 5 ++---
 src/plugins/VshlCoreApi.cpp | 7 ++++---
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 949156a..e1d60c3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,8 +37,7 @@ PROJECT_TARGET_ADD(vshl-core)
 
     # 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 49c6a78..f833968 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,5 +1,6 @@
 ###########################################################################
 # Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2019 Konsulko Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -89,7 +90,6 @@ PROJECT_TARGET_ADD(vshl-core-api)
 
     # Library dependencies (include updates automatically)
     TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        afb-helpers
         ${GLIB_PKG_LIBRARIES}
         ${link_libraries}
     )
@@ -142,7 +142,6 @@ PROJECT_TARGET_ADD(vshl-core-api)
         )
 
         TARGET_LINK_LIBRARIES(${TARGET_NAME}_Test
-            afb-helpers
             libgtest
             libgmock
             ${GLIB_PKG_LIBRARIES}
@@ -151,4 +150,4 @@ PROJECT_TARGET_ADD(vshl-core-api)
 
         ENABLE_TESTING()
         ADD_TEST(VshlCoreTest ${TARGET_NAME}_Test)
-    endif()
\ No newline at end of file
+    endif()
diff --git a/src/plugins/VshlCoreApi.cpp b/src/plugins/VshlCoreApi.cpp
index a91ca3e..a28193c 100644
--- a/src/plugins/VshlCoreApi.cpp
+++ b/src/plugins/VshlCoreApi.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2019 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -15,6 +16,8 @@
 #include "VshlCoreApi.h"
 
 #include <list>
+#include <sstream>
+#include <json.hpp>
 
 #include "afb/AFBApiImpl.h"
 #include "afb/AFBRequestImpl.h"
@@ -24,8 +27,6 @@
 #include "voiceagents/VoiceAgentEventNames.h"
 #include "voiceagents/VoiceAgentsDataManager.h"
 
-#include "json.hpp"
-
 using namespace std;
 
 CTLP_CAPI_REGISTER("vshl-core-api");
@@ -345,4 +346,4 @@ CTLP_CAPI(setDefaultVoiceAgent, source, argsJ, eventJ) {
 
     AFB_ReqSuccess(source->request, NULL, NULL);
     return 0;
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg