X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=policy_manager%2FCMakeLists.txt;h=5903340bbd0d692cce881d55c8e4c97e48286d55;hb=refs%2Fheads%2Fsandbox%2Fakiofukubayashi%2Fals2019_8.0;hp=584d3119104f4703f1551bdf459278dec6197ebb;hpb=1859dd4135f5d019f16a1333df318ecd1211afb9;p=apps%2Fagl-service-windowmanager.git

diff --git a/policy_manager/CMakeLists.txt b/policy_manager/CMakeLists.txt
index 584d311..5903340 100644
--- a/policy_manager/CMakeLists.txt
+++ b/policy_manager/CMakeLists.txt
@@ -19,21 +19,21 @@ pkg_check_modules(AFB REQUIRED afb-daemon)
 pkg_check_modules(SD REQUIRED libsystemd>=222)
 
 # Set name of STM
-set(STM_DIR stub)
-#set(STM_DIR zipc)
+#set(STM_DIR stub)
+set(STM_DIR zipc)
 
-# Select roles.db
+# Select roles.json
 if(zipc MATCHES ${STM_DIR})
     # if trying to show split layout, change from OFF to ON
-    set(TRY_SPLIT_LAYOUT OFF CACHE BOOL "Enable to show split layout")
+    set(TRY_SPLIT_LAYOUT ON CACHE BOOL "Enable to show split layout")
 
     if(${TRY_SPLIT_LAYOUT})
-        set(ROLES_DB_NAME roles.db.zipc.split)
+        set(ROLES_CONFIG_FILE_NAME roles.json.zipc.split)
     else()
-        set(ROLES_DB_NAME roles.db.zipc)
+        set(ROLES_CONFIG_FILE_NAME roles.json.zipc)
     endif()
 else()
-    set(ROLES_DB_NAME roles.db)
+    set(ROLES_CONFIG_FILE_NAME roles.json)
 endif()
 
 # Add STM directory
@@ -45,6 +45,7 @@ add_library(${TARGETS_PM}
     SHARED
         policy_manager.cpp
         stm/stm.c
+        ../src/util.cpp
 )
 
 target_include_directories(${TARGETS_PM}
@@ -98,6 +99,6 @@ add_custom_command(TARGET ${TARGETS_PM} POST_BUILD
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND cp -f ${PROJECT_BINARY_DIR}/${PLUGIN_PM}/lib${PLUGIN_PM}.so ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/db/states.db ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/db/${ROLES_DB_NAME} ${PROJECT_BINARY_DIR}/package/root/etc/roles.db
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/config/layouts.json ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/config/${ROLES_CONFIG_FILE_NAME} ${PROJECT_BINARY_DIR}/package/root/etc/roles.json
 )