From 11a7e61c482d46b63da1b90ea4f341460f71b48b Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Tue, 24 Oct 2017 14:09:38 +0900 Subject: Layer configuration file is included in widget Layer configuration file (layers.json) is placed in target when installation of windowmanager. Bug-AGL: SPEC-991 Change-Id: Ia614ec400c185ec7db4379c66321363a68e5e0da Signed-off-by: Yuta Doi --- src/config.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/config.cpp') diff --git a/src/config.cpp b/src/config.cpp index d5a549a..53e014d 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -15,12 +15,20 @@ */ #include "config.hpp" +#include "hmi-debug.h" namespace wm { config::config() : cfg() { // Supply default values for these... - this->cfg["layers.json"] = getenv("LAYERS_JSON") ?: "/etc/windowmanager/layers.json"; + char const *path_layers_json = getenv("AFM_APP_INSTALL_DIR"); + + if (!path_layers_json) { + HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); + } + else { + this->cfg["layers.json"] = std::string(path_layers_json) + std::string("/etc/layers.json"); + } } } // namespace wm -- cgit 1.2.3-korg