aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-10-15 17:45:24 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2019-10-15 17:45:24 +0000
commitc1de719af7bdae425f2e42dd3e0642550a8cd6b6 (patch)
tree8b57a26175df0b48abd5359a3e38907562ea1b5a
parent1c529a16578687c4309047e563c8b78dc15c15d0 (diff)
parentf3013d12ea27aa5849ec8da5aed1e3eebfa1b845 (diff)
Merge "Switch to afb-helpers library" into halibut
-rw-r--r--.gitmodules3
m---------afb-helpers0
-rw-r--r--conf.d/cmake/config.cmake3
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/plugins/CMakeLists.txt4
-rw-r--r--src/plugins/VshlCapabilitiesApi.cpp5
6 files changed, 6 insertions, 12 deletions
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
-Subproject fd4fe7525aaf737597e004b0a2b7d91bf18c9f1
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
+}