apps: move to shared library

Change-Id: I039bff30ad1b3745abd72ee4637caadd37487319
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de82918..ba0c0c8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,6 @@ SET(CONFDIR "/etc/${PROJECT_NAME}")
 SET(VERSION 0.1.0)
 
 SET(SRCS
-       src/apps/apps.c
        src/control/control.c
        src/core/delayed-init-notifier.c
        src/core/devices.c

diff --git a/plugins/iot-headed/display/core.c b/plugins/iot-headed/display/core.c
index cda404c..b6edf04 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -51,7 +51,7 @@
 #include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
-#include "apps/apps.h"
+#include "shared/apps.h"
 #include "extcon/extcon.h"
 #include "battery/power-supply.h"
 #include "power/power-off.h"

diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c
index 5f0d544..db9a338 100644 (file)
--- a/plugins/iot-headed/display/key-filter.c
+++ b/plugins/iot-headed/display/key-filter.c
@@ -38,10 +38,10 @@
 #include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
+#include "shared/apps.h"
 #include "power/power-off.h"
 #include "power/power-suspend.h"
 #include "led/touch-key.h"
-#include "apps/apps.h"
 #include "display/display-lock.h"
 
 #ifndef KEY_SCREENLOCK

diff --git a/plugins/mobile/battery/battery-notification.c b/plugins/mobile/battery/battery-notification.c
index 8b7b1e6..b8a9578 100644 (file)
--- a/plugins/mobile/battery/battery-notification.c
+++ b/plugins/mobile/battery/battery-notification.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <libsyscommon/libgdbus.h>
 
-#include "apps/apps.h"
 #include "core/log.h"
 #include "battery.h"
 #include "config.h"
@@ -34,6 +33,7 @@
 #include "shared/eventsystem.h"
 #include "shared/plugin.h"
 #include "shared/device-notifier.h"
+#include "shared/apps.h"
 
 
 #define METHOD_LOW_NOTI_ON          "BatteryLowNotiOn"

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 8a0a100..2e2d569 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -50,7 +50,7 @@
 #include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
-#include "apps/apps.h"
+#include "shared/apps.h"
 #include "extcon/extcon.h"
 #include "battery/power-supply.h"
 #include "power/power-off.h"

diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c
index c596cc1..1e56db1 100644 (file)
--- a/plugins/mobile/display/key-filter.c
+++ b/plugins/mobile/display/key-filter.c
@@ -38,10 +38,10 @@
 #include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
+#include "shared/apps.h"
 #include "power/power-off.h"
 #include "power/power-suspend.h"
 #include "led/touch-key.h"
-#include "apps/apps.h"
 #include "display/display-lock.h"
 
 #ifndef KEY_SCREENLOCK

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index f515e7a..d8ba642 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -50,7 +50,7 @@
 #include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
-#include "apps/apps.h"
+#include "shared/apps.h"
 #include "extcon/extcon.h"
 #include "battery/power-supply.h"
 #include "power/power-off.h"

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index dc2c2bd..42851ce 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -38,10 +38,10 @@
 #include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
+#include "shared/apps.h"
 #include "power/power-off.h"
 #include "power/power-suspend.h"
 #include "led/touch-key.h"
-#include "apps/apps.h"
 #include "display/display-lock.h"
 
 #ifndef KEY_SCREENLOCK

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index e29e170..1506958 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -51,7 +51,7 @@
 #include "shared/device-notifier.h"
 #include "core/udev.h"
 #include "shared/common.h"
-#include "apps/apps.h"
+#include "shared/apps.h"
 #include "extcon/extcon.h"
 #include "battery/power-supply.h"
 #include "power/power-off.h"

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index 68e774f..ab4b47c 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -38,10 +38,10 @@
 #include "shared/device-notifier.h"
 #include "shared/common.h"
 #include "shared/plugin.h"
+#include "shared/apps.h"
 #include "power/power-off.h"
 #include "power/power-suspend.h"
 #include "led/touch-key.h"
-#include "apps/apps.h"
 #include "display/display-lock.h"
 
 #ifndef KEY_SCREENLOCK

diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c
index 54b85f5..adc3513 100644 (file)
--- a/src/battery/lowbat-handler.c
+++ b/src/battery/lowbat-handler.c
@@ -36,6 +36,7 @@
 #include "shared/devices.h"
 #include "shared/device-notifier.h"
 #include "shared/common.h"
+#include "shared/apps.h"
 #include "core/udev.h"
 #include "shared/eventsystem.h"
 #include "shared/plugin.h"
@@ -44,7 +45,6 @@
 #include "display/display-ops.h"
 #include "power/power.h"
 #include "power/power-off.h"
-#include "apps/apps.h"
 #include "power-supply.h"
 
 #define BATTERY_UNKNOWN                -1

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index f5c57c4..dea6007 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -34,9 +34,9 @@
 #include "display/setting.h"
 #include "shared/eventsystem.h"
 #include "shared/plugin.h"
+#include "shared/apps.h"
 #include "display/core.h"
 #include "display/display-ops.h"
-#include "apps/apps.h"
 #include "power-supply.h"
 #include "battery.h"
 #include "battery-ops.h"

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index a6a5909..9b73ba9 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -36,7 +36,7 @@
 #include "shared/common.h"
 #include "shared/devices.h"
 #include "shared/device-notifier.h"
-#include "apps/apps.h"
+#include "shared/apps.h"
 #include "dd-display.h"
 #include "display-actor.h"
 #include "display-ops.h"

diff --git a/src/display/display-lock.c b/src/display/display-lock.c
index 9fb232f..b866a66 100644 (file)
--- a/src/display/display-lock.c
+++ b/src/display/display-lock.c
@@ -29,7 +29,7 @@
 #include "lock-detector.h"
 #include "display-lock.h"
 #include "shared/log-macro.h"
-#include "apps/apps.h"
+#include "shared/apps.h"
 
 #define METHOD_APP_STATUS      "CheckAppStatus"
 #define PID_MAX                        6

diff --git a/src/power/power-off.c b/src/power/power-off.c
index b7bb97c..89f9b19 100644 (file)
--- a/src/power/power-off.c
+++ b/src/power/power-off.c
@@ -49,7 +49,6 @@
 #include "display/display-ops.h"
 #include "power-off.h"
 #include "power.h"
-#include "apps/apps.h"
 #include "power-boot.h"
 #include "shared/plugin.h"
 

diff --git a/src/apps/apps.c b/src/shared/apps.c
similarity index 99%
rename from src/apps/apps.c
rename to src/shared/apps.c
index dc20230..10e53a0 100644 (file)
--- a/src/apps/apps.c
+++ b/src/shared/apps.c
@@ -17,6 +17,8 @@
  */
 
 #include <stdarg.h>
+#include <libsyscommon/libgdbus.h>
+
 #include "core/log.h"
 #include "shared/common.h"
 #include "apps.h"

diff --git a/src/apps/apps.h b/src/shared/apps.h
similarity index 100%
rename from src/apps/apps.h
rename to src/shared/apps.h

diff --git a/src/thermal/thermal.c b/src/thermal/thermal.c
index 6eee263..386d96b 100644 (file)
--- a/src/thermal/thermal.c
+++ b/src/thermal/thermal.c
@@ -23,7 +23,7 @@
 #include <hal/device/hal-thermal.h>
 #include <libsyscommon/libgdbus.h>
 
-#include "apps/apps.h"
+#include "shared/apps.h"
 #include "shared/devices.h"
 #include "core/log.h"
 #include "shared/device-notifier.h"

diff --git a/src/usb-gadget/usb-state.c b/src/usb-gadget/usb-state.c
index a3e766d..8d7a4cc 100644 (file)
--- a/src/usb-gadget/usb-state.c
+++ b/src/usb-gadget/usb-state.c
@@ -23,7 +23,7 @@
 #include <eventsystem.h>
 
 #include "core/log.h"
-#include "apps/apps.h"
+#include "shared/apps.h"
 #include "extcon/extcon.h"
 
 #include "usb-gadget.h"

diff --git a/src/usb-host/usb-host.c b/src/usb-host/usb-host.c
index 9155fb5..3dc6d78 100644 (file)
--- a/src/usb-host/usb-host.c
+++ b/src/usb-host/usb-host.c
@@ -28,8 +28,8 @@
 #include "core/log.h"
 #include "shared/devices.h"
 #include "shared/device-notifier.h"
+#include "shared/apps.h"
 #include "core/udev.h"
-#include "apps/apps.h"
 #include "extcon/extcon.h"
 #include "display/display-ops.h"
 #include "display/core.h"