summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-10-07 17:09:42 -0400
committerScott Murray <scott.murray@konsulko.com>2019-10-07 17:11:03 -0400
commitd8ddb879b61b956d0a7ebd6a181595c9a41a9562 (patch)
treef8b972f36130c0530aec9ca86f54be8ec5757c4e /src/plugins
parent3caa0589a467a836cc99cd22978d5b7178de2b63 (diff)
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
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/CMakeLists.txt4
-rw-r--r--src/plugins/VshlCapabilitiesApi.cpp5
2 files changed, 3 insertions, 6 deletions
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
+}