summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
m---------afb-helpers0
-rw-r--r--conf.d/cmake/config.cmake2
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/plugins/CMakeLists.txt5
-rw-r--r--src/plugins/VshlCoreApi.cpp7
6 files changed, 9 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules
index 9b45c19..1b125e4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "afb-helpers"]
- path = afb-helpers
- url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule
[submodule "app-controller"]
path = app-controller
url = https://gerrit.automotivelinux.org/gerrit/apps/app-controller-submodule
diff --git a/afb-helpers b/afb-helpers
deleted file mode 160000
-Subproject f0ce5b665dd33b285d723720c16ac0542cde4e6
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index d932fd1..3c16635 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -1,5 +1,6 @@
###########################################################################
# Copyright 2018 IoT.bzh
+# Copyright 2019 Konsulko Group
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
@@ -70,6 +71,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
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
+}