The battery plugin is not built, when battery module is off.

Change-Id: I5d3ded1a4708448c77a7bc61a31ed8d4134005ea
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2cda03..45d8cab 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,8 +314,10 @@ ADD_SUBDIRECTORY(plugins/mobile/display)
 ADD_SUBDIRECTORY(plugins/wearable/display)
 ADD_SUBDIRECTORY(plugins/tv/display)
 ADD_SUBDIRECTORY(plugins/iot/display)
-ADD_SUBDIRECTORY(plugins/mobile/battery)
-ADD_SUBDIRECTORY(plugins/wearable/battery)
+IF(BATTERY_MODULE STREQUAL on)
+       ADD_SUBDIRECTORY(plugins/mobile/battery)
+       ADD_SUBDIRECTORY(plugins/wearable/battery)
+ENDIF()
 INSTALL_CONF(conf mobile-display)
 INSTALL_CONF(conf wearable-display)
 INSTALL_CONF(conf tv-display)

diff --git a/packaging/deviced.spec b/packaging/deviced.spec
index 34f1af3..f23b4da 100644 (file)
--- a/packaging/deviced.spec
+++ b/packaging/deviced.spec
@@ -216,13 +216,17 @@ fi
 mv %{_sysconfdir}/deviced/mobile-display.conf %{_sysconfdir}/deviced/display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/mobile-display.so %{_libdir}/deviced/display.so
+%if %{?battery_module} == on
 mv %{_libdir}/mobile-battery.so %{_libdir}/deviced/battery.so
+%endif
 
 %post plugin-profile-wearable
 mv %{_sysconfdir}/deviced/wearable-display.conf %{_sysconfdir}/deviced/display.conf
 mkdir -p %{_libdir}/deviced
 mv %{_libdir}/wearable-display.so %{_libdir}/deviced/display.so
+%if %{?battery_module} == on
 mv %{_libdir}/wearable-battery.so %{_libdir}/deviced/battery.so
+%endif
 
 %post plugin-profile-tv
 mv %{_sysconfdir}/deviced/tv-display.conf %{_sysconfdir}/deviced/display.conf
@@ -297,7 +301,9 @@ mv %{_libdir}/iot-display.so %{_libdir}/deviced/display.so
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/deviced/mobile-display.conf
 %{_libdir}/mobile-display.so
+%if %{?battery_module} == on
 %{_libdir}/mobile-battery.so
+%endif
 %{_unitdir}/rndis.service
 %{_bindir}/rndis.sh
 
@@ -307,7 +313,9 @@ mv %{_libdir}/iot-display.so %{_libdir}/deviced/display.so
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/deviced/wearable-display.conf
 %{_libdir}/wearable-display.so
+%if %{?battery_module} == on
 %{_libdir}/wearable-battery.so
+%endif
 %{_unitdir}/rndis.service
 %{_bindir}/rndis.sh